Browse Source
Fastpickup (#160)
* presence-sync deprecated * rework bindings/custom * add ipops * rework registrar bindings * rework presence bindings * rework fastpickup * split reset specifics to new configuration file * better and less intrusive logs * ensure pickup doesn't change with state * less noise in logsKAZOO-5650
lazedo
9 years ago
committed by
bitbashing
bitbashing
9 changed files with 229 additions and 218 deletions
Unified View
Diff Options
-
+3 -15kamailio/default.cfg
-
+84 -39kamailio/fast-pickup-role.cfg
-
+2 -11kamailio/kazoo-bindings.cfg
-
+0 -5kamailio/kazoo-custom-bindings.cfg
-
+0 -1kamailio/local.cfg
-
+80 -0kamailio/presence-reset.cfg
-
+46 -105kamailio/presence-role.cfg
-
+0 -42kamailio/presence_sync-role.cfg
-
+14 -0kamailio/registrar-role.cfg
+ 3
- 15
kamailio/default.cfg
View File
+ 84
- 39
kamailio/fast-pickup-role.cfg
View File
+ 2
- 11
kamailio/kazoo-bindings.cfg
View File
+ 0
- 5
kamailio/kazoo-custom-bindings.cfg
View File
| @ -1,5 +0,0 @@ | |||||
| ######## kazoo custom bindings ######## | |||||
| # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab | |||||
+ 0
- 1
kamailio/local.cfg
View File
+ 80
- 0
kamailio/presence-reset.cfg
View File
| @ -0,0 +1,80 @@ | |||||
| ##### PRESENCE RESET ROUTINES | |||||
| 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 }"; | |||||
| kazoo_subscribe("$var(payload)"); | |||||
| #!endif | |||||
| } | |||||
| route[RESET_ZONE] | |||||
| { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for this zone\n"); | |||||
| sql_query("exec", "delete from presentity"); | |||||
| $var(presentities) = $sqlrows(exec); | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|removed $var(presentities) presentities\n"); | |||||
| } | |||||
| route[RESET_ACCOUNT] | |||||
| { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for realm $(kzE{kz.json,Realm})\n"); | |||||
| sql_query("exec", 'delete from presentity where domain="$(kzE{kz.json,Realm})" '); | |||||
| $var(presentities) = $sqlrows(exec); | |||||
| sql_query("exec", 'update active_watchers set expires = $TS where watcher_domain="$(kzE{kz.json,Realm})" '); | |||||
| $var(watchers) = $sqlrows(exec); | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|removed $var(presentities) presentities and expired $var(watchers) subscribers for realm $(kzE{kz.json,Realm})\n"); | |||||
| } | |||||
| route[RESET_WILDCARD] | |||||
| { | |||||
| if($(kzE{kz.json,Realm}) == "*") { | |||||
| if($(kzE{kz.json,Username}) == "MY_AMQP_ZONE") { | |||||
| route(RESET_ZONE); | |||||
| } else { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for zone $(kzE{kz.json,Username}). 'MY_AMQP_ZONE' doesn't care\n"); | |||||
| } | |||||
| exit(); | |||||
| } else { | |||||
| route(RESET_ACCOUNT); | |||||
| } | |||||
| } | |||||
| event_route[kazoo:consumer-event-presence-reset] | |||||
| { | |||||
| if($(kzE{kz.json,Username}) == "*" || $(kzE{kz.json,Realm}) == "*") { | |||||
| route(RESET_WILDCARD); | |||||
| exit(); | |||||
| } | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|received presence reset for $(kzE{kz.json,Username})@$(kzE{kz.json,Realm})\n"); | |||||
| $var(presentity) = "sip:" + $(kzE{kz.json,Username}) + "@" + $(kzE{kz.json,Realm}); | |||||
| sql_query("exec", 'delete from presentity where domain="$(kzE{kz.json,Realm})" and username = "$(kzE{kz.json,Username})"'); | |||||
| if(pres_has_subscribers("$var(presentity)", "message-summary")) { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying 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"); | |||||
| } | |||||
| if(pres_has_subscribers("$var(presentity)", "presence")) { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying 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"); | |||||
| } | |||||
| if(pres_has_subscribers("$var(presentity)", "dialog")) { | |||||
| xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|reset|notifying 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"); | |||||
| } | |||||
| } | |||||
+ 46
- 105
kamailio/presence-role.cfg
View File
+ 0
- 42
kamailio/presence_sync-role.cfg
View File
| @ -1,42 +0,0 @@ | |||||
| ######## Presence sync server module ######## | |||||
| ####### SQL OPS module ########## | |||||
| #!ifndef SQLOPS_LOADED | |||||
| loadmodule "sqlops.so" | |||||
| modparam("sqlops","sqlcon", "cb=>KAZOO_DB_URL") | |||||
| #!trydef SQLOPS_LOADED | |||||
| #!endif | |||||
| event_route[kazoo:consumer-event-presence-sync] | |||||
| { | |||||
| xlog("L_INFO", "received SYNC $kzE\n"); | |||||
| $var(Queue) = $(kzE{kz.json,Server-ID}); | |||||
| $var(Now) = $TS; | |||||
| ######## SEND BACK START ######## | |||||
| $var(amqp_payload_request) = '{"Event-Category" : "presence", "Event-Name" : "sync", "Action" : "Start" }'; | |||||
| kazoo_publish("targeted", "$var(Queue)", $var(amqp_payload_request)); | |||||
| if (sql_xquery("cb", "select * from active_watchers where expires > $var(Now)", "ra") == 1) | |||||
| { | |||||
| while($xavp(ra) != $null) | |||||
| { | |||||
| $var(runloop) = 1; | |||||
| while($xavp(ra) != $null && $var(runloop) < MAX_WHILE_LOOPS ) { | |||||
| xlog("L_INFO", "[id, presentity, watcher] = [$xavp(ra=>id), $xavp(ra=>presentity_uri), $xavp(ra=>watcher_username)]\n"); | |||||
| $var(Expires) = $xavp(ra=>expires) - $var(Now); | |||||
| xlog("L_INFO", "EXPIRES $var(Expires) , $xavp(ra=>expires) , $var(Now)\n"); | |||||
| $var(amqp_payload_request) = '{"Event-Category" : "presence", "Event-Name" : "subscription", "Event-Package" : "$xavp(ra=>event)", "Expires" : $var(Expires), "Server-ID" : "BLF-MY_HOSTNAME" , "Contact" : "$xavp(ra=>contact)", "Call-ID" : "$xavp(ra=>callid)", "From" : "sip:$xavp(ra=>watcher_username)@$xavp(ra=>watcher_domain)", "User" : "$xavp(ra=>presentity_uri)" }"'; | |||||
| kazoo_publish("targeted", "$var(Queue)", $var(amqp_payload_request)); | |||||
| pv_unset("$xavp(ra)"); | |||||
| $var(runloop) = $var(runloop) + 1; | |||||
| } | |||||
| } | |||||
| } | |||||
| ######## SEND BACK END ######## | |||||
| $var(amqp_payload_request) = '{"Event-Category" : "presence", "Event-Name" : "sync", "Action" : "End" }'; | |||||
| kazoo_publish("targeted", "$var(Queue)", $var(amqp_payload_request)); | |||||
| } | |||||
| # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab | |||||