From 0f35dc46b0f4da76dfca8ce16065e5d07fc13d16 Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Thu, 17 Jan 2019 20:20:28 +0000
Subject: [PATCH] change var for logging, fix msg & missing test

---
 kamailio/presence-role.cfg | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index e8e32ce..9cfdf49 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -343,7 +343,7 @@ route[COUNT_SUBSCRIBERS]
 
 event_route[kazoo:consumer-event-presence-dialog-update]
 {
-   $var(presence_log_level) = $sel(cfg_get.kazoo.presence_no_targets_log_level);
+   $var(kz_presence_log_level) = $(sel(cfg_get.kazoo.presence_no_targets_log_level){s.int});
    $var(StartRoute) = $(TV(Sn){s.replace,.,});
    $var(delta_to_start) = $var(StartRoute) - $(kzE{kz.json,AMQP-Received});
    xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|received $(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,AMQP-Broker-Zone}) => $(kzE{kz.json,Switch-URI}) (Δ1 $(kzE{kz.json,AMQP-Elapsed-Micro}) μs , Δ2 $var(delta_to_start) μs)\n");
@@ -359,24 +359,25 @@ event_route[kazoo:consumer-event-presence-dialog-update]
    $var(EndRoute) = $(TV(Sn){s.replace,.,});
    $var(delta_to_finish) = $var(EndRoute) - $var(StartRoute);
 
-   xlog("$var(presence_log_level)", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,AMQP-Broker-Zone}) => $(kzE{kz.json,Switch-URI}) (Δ1 $(kzE{kz.json,AMQP-Elapsed-Micro}) μs , Δ2 $var(delta_to_start) μs, Δ3 $var(delta_to_finish) μs)\n");
+   xlog("$var(kz_presence_log_level)", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,AMQP-Broker-Zone}) => $(kzE{kz.json,Switch-URI}) (Δ1 $(kzE{kz.json,AMQP-Elapsed-Micro}) μs , Δ2 $var(delta_to_start) μs, Δ3 $var(delta_to_finish) μs)\n");
 }
 
 event_route[kazoo:consumer-event-presence-mwi-update]
 {
-   $var(presence_log_level) = $sel(cfg_get.kazoo.presence_no_targets_log_level);
+   $var(kz_presence_log_level) = $(sel(cfg_get.kazoo.presence_no_targets_log_level){s.int});
    xlog("L_DBG", "$(kzE{kz.json,Call-ID})|log|received message-summary update for $(kzE{kz.json,From}) ($(kzE{kz.json,AMQP-Broker-Zone}))\n");
    $var(presentity) = $(kzE{kz.json,From});
    $var(payload) = $kzE;
    route(COUNT_SUBSCRIBERS);
    if($xavp(watchers=>message-summary) > 0) {
-      $var(presence_log_level) = L_INFO;
+      $var(kz_presence_log_level) = L_INFO;
       xlog("L_INFO", "$(kzE{kz.json,Call-ID})|log|publishing $(kzE{kz.json,From}) message-summary update for $xavp(watchers=>message-summary) watchers\n");
       kazoo_pua_publish_mwi($kzE);
       pres_refresh_watchers("$(kzE{kz.json,From})", "message-summary", 1);
    } else {
 #!ifdef PRESENCE_TRACK_ALL_PKG_MWI
       if($(kzE{kz.json,Event-Package}) == "message-summary") {
+         $var(kz_presence_log_level) = L_INFO;
          xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|saving $var(presentity) from mwi update => $var(payload)\n");
          if(kazoo_pua_publish_mwi($kzE) != 1) {
              xlog("L_ERR", "$(var(payload){kz.json,Call-ID})|log|error publishing $var(presentity) mwi update => $var(payload)\n");
@@ -388,13 +389,13 @@ event_route[kazoo:consumer-event-presence-mwi-update]
    }
 
    route(MWI_AS_PRESENCE);
-   xlog("$var(presence_log_level)", "$(kzE{kz.json,Call-ID})|log|message-summary update for $(kzE{kz.json,From}) light should be on ? $(kzE{kz.json,Messages-Waiting}) at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
+   xlog("$var(kz_presence_log_level)", "$(kzE{kz.json,Call-ID})|log|message-summary update for $(kzE{kz.json,From}) light should be on ? $(kzE{kz.json,Messages-Waiting}) at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
 
 }
 
 event_route[kazoo:consumer-event-presence-update]
 {
-   $var(presence_log_level) = $sel(cfg_get.kazoo.presence_no_targets_log_level);
+   $var(kz_presence_log_level) = $(sel(cfg_get.kazoo.presence_no_targets_log_level){s.int});
    if($sel(cfg_get.kazoo.presence_ignore_status_probe_resp) == 1) {
        if($(kzE{kz.json,State}) == "offline" || $(kzE{kz.json,State}) == "online") {
           xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|ignoring $(kzE{kz.json,State}) state $(kzE{kz.json,Presence-ID})\n");
@@ -408,7 +409,7 @@ event_route[kazoo:consumer-event-presence-update]
    $var(payload) = $kzE;
    route(PRESENCE_UPDATE);
 
-   xlog("$var(presence_log_level)", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,Switch-URI}) Δ at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
+   xlog("$var(kz_presence_log_level)", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,Switch-URI}) Δ at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
 }
 
 route[PRESENCE_UPDATE]
@@ -426,7 +427,7 @@ route[PRESENCE_UPDATE]
        xlog("L_WARN", "$(var(payload){kz.json,Call-ID})|log|not publishing state $(var(payload){kz.json,State}) for presentity $var(presentity) with $xavp(watchers=>self) calls, policy limit of $sel(cfg_get.kazoo.presence_max_call_per_presentity) calls per presentity \n");
    } else {
        if($xavp(watchers=>dialog) > 0) {
-          $var(presence_log_level) = L_INFO;
+          $var(kz_presence_log_level) = L_INFO;
           if($(var(payload){kz.json,State}) == "terminated") {
               xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|publishing $var(presentity) dialog update for terminated dialog\n");
           } else {
@@ -440,6 +441,7 @@ route[PRESENCE_UPDATE]
        } else {
 #!ifdef PRESENCE_TRACK_ALL_PKG_DIALOG
          if($(kzE{kz.json,Event-Package}) == "dialog") {
+            $var(kz_presence_log_level) = L_INFO;
             xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|saving $var(presentity) from dialog update => $var(payload)\n");
             if(kazoo_pua_publish_dialoginfo($var(JObj)) != 1) {
                 xlog("L_ERR", "$(var(payload){kz.json,Call-ID})|log|error publishing $var(presentity) dialog update => $var(payload)\n");
@@ -451,17 +453,17 @@ route[PRESENCE_UPDATE]
        }
 
        if($xavp(watchers=>presence) > 0) {
-          $var(presence_log_level) = L_INFO;
+          $var(kz_presence_log_level) = L_INFO;
           xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|publishing $var(presentity) presence update for $xavp(watchers=>presence) watchers\n");
           kazoo_pua_publish_presence($var(payload));
           pres_refresh_watchers("$var(presentity)", "presence", 1);
        } else {
 #!ifdef PRESENCE_TRACK_ALL_PKG_PRESENCE
          if($(kzE{kz.json,Event-Package}) == "presence") {
-            $var(presence_log_level) = L_INFO;
-            xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|saving $var(presentity) from dialog update => $var(payload)\n");
+            $var(kz_presence_log_level) = L_INFO;
+            xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|saving $var(presentity) from presence update => $var(payload)\n");
             if(kazoo_pua_publish_dialoginfo($var(JObj)) != 1) {
-                xlog("L_ERR", "$(var(payload){kz.json,Call-ID})|log|error publishing $var(presentity) dialog update => $var(payload)\n");
+                xlog("L_ERR", "$(var(payload){kz.json,Call-ID})|log|error publishing $var(presentity) presence update => $var(payload)\n");
             }
          }
 #!else