From 48ba777d003510f33d5dfd82c6020f07daee0b87 Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Sun, 13 Jan 2019 11:58:51 +0000
Subject: [PATCH] move search & reset to api

---
 kamailio/presence-query.cfg |  6 ------
 kamailio/presence-reset.cfg | 19 ++++---------------
 kamailio/presence-role.cfg  | 13 ++++++++++---
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/kamailio/presence-query.cfg b/kamailio/presence-query.cfg
index cbfd290..2a7c3cb 100644
--- a/kamailio/presence-query.cfg
+++ b/kamailio/presence-query.cfg
@@ -104,10 +104,4 @@ event_route[kazoo:consumer-event-presence-search-req]
   }
 }
 
-route[PRESENCE_QUERY_BINDINGS]
-{
-    $var(payload) = $_s({"name": "presence-query", "exchange": "presence", "type": "topic", "queue": "presence-search-MY_HOSTNAME", "routing": "presence.search_req.*", "exclusive": 0, "federate": 1 });
-    kazoo_subscribe("$var(payload)");
-}
-
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab
diff --git a/kamailio/presence-reset.cfg b/kamailio/presence-reset.cfg
index 002772e..61315e7 100644
--- a/kamailio/presence-reset.cfg
+++ b/kamailio/presence-reset.cfg
@@ -15,17 +15,6 @@ route[PRESENCE_RESET_ROUTE]
   }
 }
 
-route[PRESENCE_RESET_BINDINGS]
-{
-   #!import_file "presence-reset-custom-bindings.cfg"
-    
-   #!ifndef PRESENCE_RESET_CUSTOM_BINDINGS
-   $var(payload) = $_s({"name": "presence-reset", "exchange": "presence", "queue": "presence-reset-MY_HOSTNAME", "type": "topic", "routing": "presence.reset.*.*", "exclusive": 0, "federate": 1 });
-   kazoo_subscribe("$var(payload)");
-   #!endif
-
-}
-
 route[RESET_PUBLISHER]
 {
    xlog("L_INFO", "$var(Msg-ID)|reset|received presence reset for publisher $var(MediaUrl)\n");
@@ -136,7 +125,7 @@ event_route[kazoo:consumer-event-presence-reset]
       exit();
    }
 
-   xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for  $(kzE{kz.json,Username})@$(kzE{kz.json,Realm})\n");
+   xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for $(kzE{kz.json,Username})@$(kzE{kz.json,Realm})\n");
    $var(presentity) = $_s(sip:$(kzE{kz.json,Username})@$(kzE{kz.json,Realm}));
    route(COUNT_SUBSCRIBERS);
    sql_query("exec", 'KZQ_EVENT_PRESENCE_RESET_DELETE');
@@ -145,21 +134,21 @@ event_route[kazoo:consumer-event-presence-reset]
       xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying $xavp(watchers=>message-summary) message-summary subscribers of $var(presentity)\n");
       pres_refresh_watchers("$var(presentity)", "message-summary", 1);
    } else {
-      xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|skip message-summary subscriber notification for $var(presentity)\n");
+      xlog("L_DEBUG", "$(kzE{kz.json,Msg-ID})|reset|skip message-summary subscriber notification for $var(presentity)\n");
    }
 
    if($xavp(watchers=>presence) > 0) {
       xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying $xavp(watchers=>presence) presence subscribers of $var(presentity)\n");
       pres_refresh_watchers("$var(presentity)", "presence", 1);
    } else {
-      xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|skip presence subscriber notification for $var(presentity)\n");
+      xlog("L_DEBUG", "$(kzE{kz.json,Msg-ID})|reset|skip presence subscriber notification for $var(presentity)\n");
    }
 
    if($xavp(watchers=>dialog) > 0) {
       xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying $xavp(watchers=>dialog) dialog subscribers of $var(presentity)\n");
       pres_refresh_watchers("$var(presentity)", "dialog", 1);
    } else {
-      xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|skip dialog subscriber notification for $var(presentity)\n");
+      xlog("L_DEBUG", "$(kzE{kz.json,Msg-ID})|reset|skip dialog subscriber notification for $var(presentity)\n");
    }
 
 }
diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index 285102e..3c929de 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -501,11 +501,9 @@ route[PRESENCE_BINDINGS]
    #!ifndef PRESENCE_CUSTOM_BINDINGS
    $var(payload) = $_s({ "name" : "presence", "exchange" : "presence", "type" : "topic", "queue" : "presence-dialog-MY_HOSTNAME", "routing" : ["dialog.*.*", "update.*.*", "mwi_updates.*.*"], "exclusive" : 0, "federate" : 1 });
    kazoo_subscribe("$var(payload)");
-
    #!endif
 
-   route(PRESENCE_RESET_BINDINGS);
-   route(PRESENCE_QUERY_BINDINGS);
+   route(PRESENCE_API_BINDINGS);
 
    #!ifdef FAST_PICKUP_ROLE
    route(FAST_PICKUP_START);
@@ -513,6 +511,15 @@ route[PRESENCE_BINDINGS]
 
 }
 
+route[PRESENCE_API_BINDINGS]
+{
+   #!import_file "presence-api-custom-bindings.cfg"
+    
+   #!ifndef PRESENCE_API_CUSTOM_BINDINGS
+   $var(payload) = $_s({"name": "presence-api", "exchange": "presence", "type": "topic", "queue": "presence-api-MY_HOSTNAME", "routing": ["presence.search_req.*", "presence.reset.*.*"], "exclusive": 0, "federate": 1 });
+   kazoo_subscribe("$var(payload)");
+   #!endif
 
+}
 
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab