From b6ad5682634224a64d143f0576eba2a37634ce51 Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Sun, 13 Jan 2019 19:33:53 +0000
Subject: [PATCH] more bindings and logs

---
 kamailio/acl-role.cfg       |  6 ++++++
 kamailio/kazoo-bindings.cfg | 19 +++++++++----------
 kamailio/message-role.cfg   |  2 +-
 kamailio/registrar-role.cfg |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kamailio/acl-role.cfg b/kamailio/acl-role.cfg
index 664298d..f4fc1df 100644
--- a/kamailio/acl-role.cfg
+++ b/kamailio/acl-role.cfg
@@ -265,3 +265,9 @@ event_route[kazoo:consumer-event-acl-acl-flush]
     }
 
 }
+
+route[ACL_BINDINGS]
+{
+    $var(payload) = $_s({"name": "acl-role", "exchange" : "frontier_acl" , "type" : "topic", "queue" : "FRONTIERACL-FLUSH-MY_HOSTNAME", "routing" : "flush" });
+    kazoo_subscribe("$var(payload)");
+}
\ No newline at end of file
diff --git a/kamailio/kazoo-bindings.cfg b/kamailio/kazoo-bindings.cfg
index 7c192e1..5b35e79 100644
--- a/kamailio/kazoo-bindings.cfg
+++ b/kamailio/kazoo-bindings.cfg
@@ -36,8 +36,7 @@ event_route[kazoo:mod-init]
     #!endif
 
     #!ifdef ACL_ROLE
-    $var(payload) = "{ 'exchange' : 'frontier_acl' , 'type' : 'topic', 'queue' : 'FRONTIERACL-FLUSH-MY_HOSTNAME', 'routing' : 'flush' }";
-    kazoo_subscribe("$var(payload)");
+    route(ACL_BINDINGS);
     #!endif
 
     #!import_file  "kazoo-custom-bindings.cfg"
@@ -51,32 +50,32 @@ event_route[kazoo:consumer-event]
 
 event_route[kazoo:consumer-event-connection-open]
 {
-    xlog("L_NOTICE","connection to $(kzE{kz.json,host}) opened\n");
+    xlog("L_DEBUG","connection to $(kzE{kz.json,host}) opened\n");
 }
 
 event_route[kazoo:consumer-event-connection-error]
 {
-    xlog("L_ERR","amqp|error|$(kzE{kz.json,zone})|$(kzE{kz.json,name})| $(kzE{kz.json,message})\n");
+    xlog("L_ERR","amqp|error|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|$(kzE{kz.json,message})\n");
 }
 
 event_route[kazoo:consumer-event-connection-message]
 {
-    xlog("L_NOTICE","amqp|msg|$(kzE{kz.json,zone})|$(kzE{kz.json,name})| $(kzE{kz.json,message})\n");
+    xlog("L_DEBUG","amqp|msg|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|$(kzE{kz.json,message})\n");
 }
 
 event_route[kazoo:consumer-event-connection-closed]
 {
-    xlog("L_WARN","amqp|closed|$(kzE{kz.json,zone})|$(kzE{kz.json,name})| connection to $(kzE{kz.json,host}) closed\n");
+    xlog("L_DEBUG","amqp|closed|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|connection to $(kzE{kz.json,host}) closed\n");
 }
 
 event_route[kazoo:consumer-event-connection-zone-available]
 {
-    xlog("L_NOTICE","amqp zone $(kzE{kz.json,zone}) is available\n");
+    xlog("L_DEBUG","amqp zone $(kzE{kz.json,zone}) is available\n");
 }
 
 event_route[kazoo:consumer-event-connection-zone-unavailable]
 {
-    xlog("L_WARN","amqp zone $(kzE{kz.json,zone}) is unavailable\n");
+    xlog("L_DEBUG","amqp zone $(kzE{kz.json,zone}) is unavailable\n");
 }
 
 event_route[kazoo:consumer-event-connection-available]
@@ -106,7 +105,7 @@ event_route[kazoo:consumer-event-connection-listener-zone-available]
 
 event_route[kazoo:consumer-event-connection-listener-zone-unavailable]
 {
-    xlog("L_DEBUG","amqp zone $(kzE{kz.json,zone}) is unavailable\n");
+    xlog("L_WARN","amqp|connection|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|listener unavailable\n");
 
     #!ifdef PRESENCE_ROLE
     route(PRESENCE_ZONE_UNAVAILABLE);
@@ -115,7 +114,7 @@ event_route[kazoo:consumer-event-connection-listener-zone-unavailable]
 
 event_route[kazoo:consumer-event-connection-listener-available]
 {
-    xlog("L_DEBUG","amqp zone $(kzE{kz.json,zone}) is available\n");
+    xlog("L_NOTICE","amqp|connection|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|listener available\n");
 }
 
 event_route[kazoo:consumer-event-connection-listener-unavailable]
diff --git a/kamailio/message-role.cfg b/kamailio/message-role.cfg
index 1b56a5a..559ee21 100644
--- a/kamailio/message-role.cfg
+++ b/kamailio/message-role.cfg
@@ -54,7 +54,7 @@ route[MESSAGE_REPLY]
 route[MESSAGE_BINDINGS]
 {
     $var(key) = "kamailio@MY_HOSTNAME";
-    $var(payload) = $_s({"exchange": "sms", "type": "topic", "queue": "MSG-QUEUE-MY_HOSTNAME", "routing": "message.route.$(var(key){kz.encode}).*", "no_ack": 0 });
+    $var(payload) = $_s({"name": "sms", "exchange": "sms", "type": "topic", "queue": "MSG-QUEUE-MY_HOSTNAME", "routing": "message.route.$(var(key){kz.encode}).*", "no_ack": 0 });
     kazoo_subscribe("$var(payload)");
 }
 
diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index 3a10c0a..b3a0263 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -376,7 +376,7 @@ route[REGISTRAR_BINDINGS]
 
     #!ifndef REGISTRAR_CUSTOM_BINDINGS
 
-    $var(payload) = $_s({"name": "registrar", "exchange": "registrar", "type": "topic", "queue": "registrar-flush-MY_HOSTNAME", "routing": "registration.flush.*", "federate": 1 });
+    $var(payload) = $_s({"name": "registrar-api", "exchange": "registrar", "type": "topic", "queue": "registrar-flush-MY_HOSTNAME", "routing": "registration.flush.*", "federate": 1 });
     kazoo_subscribe("$var(payload)");
 
     #!endif