From 708c70c27d5750240b2ce927e40d80ab7a827a21 Mon Sep 17 00:00:00 2001 From: bitbashing Date: Wed, 7 Jun 2017 13:33:51 -0700 Subject: [PATCH] cleanup the kamailio bindings (#174) --- kamailio/kazoo-bindings.cfg | 2 +- kamailio/message-role.cfg | 2 +- kamailio/presence-reset.cfg | 2 +- kamailio/presence-role.cfg | 6 +++--- kamailio/presence_query-role.cfg | 2 +- kamailio/registrar-role.cfg | 2 +- kamailio/registrar-sync-role.cfg | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kamailio/kazoo-bindings.cfg b/kamailio/kazoo-bindings.cfg index 304ef47..c4c520f 100644 --- a/kamailio/kazoo-bindings.cfg +++ b/kamailio/kazoo-bindings.cfg @@ -36,7 +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', 'no_ack' : 1, 'wait_for_consumer_ack' : 0 }"; + $var(payload) = "{ 'exchange' : 'frontier_acl' , 'type' : 'topic', 'queue' : 'FRONTIERACL-FLUSH-MY_HOSTNAME', 'routing' : 'flush' }"; kazoo_subscribe("$var(payload)"); #!endif diff --git a/kamailio/message-role.cfg b/kamailio/message-role.cfg index 8a8b9a1..a0fa312 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) = '{ "exchange" : "sms" , "type" : "topic", "queue" : "MSG-QUEUE-MY_HOSTNAME", "routing" : "message.route.' + $(var(key){kz.encode}) + '.*", "no_ack" : 0, "wait_for_consumer_ack" : 1 }'; + $var(payload) = "{ '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/presence-reset.cfg b/kamailio/presence-reset.cfg index 3ecc20e..59933d8 100644 --- a/kamailio/presence-reset.cfg +++ b/kamailio/presence-reset.cfg @@ -19,7 +19,7 @@ route[PRESENCE_RESET_BINDINGS] #!import_file "presence-reset-custom-bindings.cfg" #!ifndef PRESENCE_RESET_CUSTOM_BINDINGS - $var(payload) = "{ 'exchange' : 'presence' , 'queue' : 'presence-reset-MY_HOSTNAME', 'exclusive' : 0 ,'type' : 'topic', 'routing' : 'presence.reset.*.*', 'federate' : 1 }"; + $var(payload) = "{ 'exchange' : 'presence' , 'queue' : 'presence-reset-MY_HOSTNAME', 'type' : 'topic', 'routing' : 'presence.reset.*.*', 'exclusive' : 0, 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); #!endif diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg index 94483ce..c170111 100644 --- a/kamailio/presence-role.cfg +++ b/kamailio/presence-role.cfg @@ -278,13 +278,13 @@ route[PRESENCE_BINDINGS] #!import_file "presence-custom-bindings.cfg" #!ifndef PRESENCE_CUSTOM_BINDINGS - $var(payload) = "{ 'exchange' : 'presence' , 'queue' : 'presence-dialog-MY_HOSTNAME', 'exclusive' : 0 ,'type' : 'topic', 'routing' : 'dialog.*.*', 'federate' : 1 }"; + $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-dialog-MY_HOSTNAME', 'routing' : 'dialog.*.*', 'exclusive' : 0, 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); - $var(payload) = "{ 'exchange' : 'presence' , 'queue' : 'presence-presence-MY_HOSTNAME', 'exclusive' : 0 ,'type' : 'topic', 'routing' : 'update.*.*', 'federate' : 1 }"; + $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-presence-MY_HOSTNAME', 'routing' : 'update.*.*', 'exclusive' : 0, 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); - $var(payload) = "{ 'exchange' : 'presence' , 'queue' : 'presence-mwi-MY_HOSTNAME', 'exclusive' : 0 ,'type' : 'topic', 'routing' : 'mwi_updates.*', 'federate' : 1 }"; + $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-mwi-MY_HOSTNAME', 'routing' : 'mwi_updates.*', 'exclusive' : 0 , 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); #!endif diff --git a/kamailio/presence_query-role.cfg b/kamailio/presence_query-role.cfg index b9ae5f1..5f46ebf 100644 --- a/kamailio/presence_query-role.cfg +++ b/kamailio/presence_query-role.cfg @@ -105,7 +105,7 @@ event_route[kazoo:consumer-event-presence-search-req] route[PRESENCE_QUERY_BINDINGS] { - $var(payload) = "{ 'exchange' : 'presence' , 'type' : 'topic', 'queue' : 'presence-search-MY_HOSTNAME', 'exclusive' : 0, 'routing' : 'presence.search_req.*', 'federate' : 1 }"; + $var(payload) = "{ 'exchange' : 'presence' , 'type' : 'topic', 'queue' : 'presence-search-MY_HOSTNAME', 'routing' : 'presence.search_req.*', 'exclusive' : 0, 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); } diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg index 1d05d32..b15d0c7 100644 --- a/kamailio/registrar-role.cfg +++ b/kamailio/registrar-role.cfg @@ -325,7 +325,7 @@ route[REGISTRAR_BINDINGS] #!ifndef REGISTRAR_CUSTOM_BINDINGS - $var(payload) = "{ 'exchange' : 'registrar' , 'type' : 'topic', 'queue' : 'registrar-flush-MY_HOSTNAME', 'routing' : 'registration.flush.*', 'federate' : 1, 'no_ack' : 1, 'wait_for_consumer_ack' : 0 }"; + $var(payload) = "{ 'exchange' : 'registrar' , 'type' : 'topic', 'queue' : 'registrar-flush-MY_HOSTNAME', 'routing' : 'registration.flush.*', 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); #!endif diff --git a/kamailio/registrar-sync-role.cfg b/kamailio/registrar-sync-role.cfg index 5cbe647..af2254b 100644 --- a/kamailio/registrar-sync-role.cfg +++ b/kamailio/registrar-sync-role.cfg @@ -26,6 +26,6 @@ event_route[kazoo:consumer-event-directory-reg-sync] route[REGISTRAR_SYNC_BINDINGS] { - $var(payload) = "{ 'exchange' : 'registrar' , 'type' : 'topic', 'queue' : 'registra-sync-MY_HOSTNAME', 'routing' : 'registration.sync', 'no_ack' : 1, 'wait_for_consumer_ack' : 0 }"; + $var(payload) = "{ 'exchange' : 'registrar' , 'type' : 'topic', 'queue' : 'registrar-sync-MY_HOSTNAME', 'routing' : 'registration.sync' }"; kazoo_subscribe("$var(payload)"); }