KAZOO-2870: pull request tweaks

kamailio/default.cfg

@@ -151,16 +151,21 @@ modparam("db_text", "db_mode", 1)
 loadmodule "db_kazoo.so"
 modparam("db_kazoo", "node_hostname",  "MY_HOSTNAME")
 modparam("db_kazoo", "register_fs_path", "MY_IP_ADDRESS")
-modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_1")
-modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_2")
-#modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_3")
-#modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_4")
-modparam("db_kazoo", "amqp_max_channels", AMQP_NUMBER_OF_CHANNELS)
+modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL")
+#!ifdef MY_AMQP_URL_SECONDARY
+modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_SECONDARY")
+#!endif
+#!ifdef MY_AMQP_URL_TERTIARY
+#modparam("db_kazoo", "amqp_connection", "MY_AMQP_URL_TERTIARY")
+#!endif
+#!ifdef MY_AMQP_MAX_CHANNELS
+modparam("db_kazoo", "amqp_max_channels", MY_AMQP_MAX_CHANNELS)
+#!else
+modparam("db_kazoo", "amqp_max_channels", 100)
+#!endif
 modparam("db_kazoo", "amqp_internal_loop_count", 1);
 modparam("db_kazoo", "amqp_consumer_loop_count", 3);
 
-
-
 ####### Role Configurations ##########
 #!ifdef DISPATCHER-ROLE
 include_file "dispatcher-role.cfg"
@@ -602,8 +607,7 @@ event_route[kazoo:mod-init]
 
 event_route[kazoo:consumer-event]
 {
-    xlog("L_INFO","REALLY!! you subscribed for something and you're not handling it ?");
-    xlog("L_INFO","Payload : $kzE");
+    xlog("L_INFO","unhandled AMQP event, payload: $kzE");
 }
 
 

kamailio/dispatcher-role.cfg

@@ -82,21 +82,6 @@ route[DISPATCHER_FIND_ROUTES]
                   return;
                }
           }
-       } else {
-         ## query user channels - maybe we should this only to feature codes, *3... or *
-          $var(amqp_payload_request) = "{'Event-Category' : 'call_event' , 'Event-Name' : 'query_user_channels_req', 'Realm' : '" + $fd + "', 'Username' : '" + $fU + "', 'Active-Only' : false }";
-          $var(amqp_routing_key) = "call.status_req.$(ci{kz.encode})";
-          xlog("L_DBG", "$ci|log|amqp_payload_user_channels = $var(amqp_payload_request)");
-          xlog("L_DBG", "$ci|log|amqp_payload_user_channels key = $var(amqp_routing_key)");
-          if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request), "$var(amqp_result)")) {
-             xlog("L_DBG", "$ci|log|amqp_result_user_channels = $var(amqp_result)");
-             $du = $(var(amqp_result){kz.json,Channels[0].switch_url});
-             if($du != $null) {
-                  xlog("L_DBG", "$ci|log|user channels found redirecting call to $du, courtesy of kazoo");
-                  return;
-             }
-          }
-
        }
     }
 

kamailio/presence-role.cfg

@@ -49,7 +49,6 @@ route[HANDLE_SUBSCRIBE]
 
         $var(amqp_payload_request) = "{'Event-Category' : 'presence', 'Event-Name' : 'subscription', 'Event-Package' : '" + $hdr(event) + "', 'Expires' : " + $hdr(Expires) + ", 'Queue' : 'BLF-MY_HOSTNAME', 'Server-ID' : 'BLF-MY_HOSTNAME' ,'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', 'From' : '" + $fu +"', 'User' : '" + $tu + "', 'User-Agent' : '" + $ua + "' }";
 
-        xlog("L_DBG", "$ci|log|amqp_presence = $var(amqp_payload_request)");
         kazoo_publish("dialoginfo_subs", "dialoginfo_subs", $var(amqp_payload_request));                 
 
         t_release();
@@ -75,23 +74,7 @@ route[HANDLE_PUBLISH]
 
 event_route[kazoo:consumer-event-presence-update]
 {
-    xlog("L_DBG","AMQP PRESENCE EVENT : $kzE");
-    
     kazoo_pua_publish($kzE);
-    
-#    switch($(kzE{kz.json,Event-Package}))
-#        {
-#            case "message-summary":
-#                kazoo_pua_publish($kzE);
-#                break;
-#            case "dialog":
-#                xlog("L_INFO","kazoo is great.\n");
-#                kazoo_pua_publish($kzE);
-#                break;
-#            default:
-#                xlog("L_INFO","unhandled event package $(kzE{kz.json,Event-Package})");
-#       }
-
 }
 
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab

kamailio/registrar-role.cfg

@@ -95,7 +95,7 @@ route[HANDLE_REGISTER]
             }
         } else {
             auth_challenge("$fd", "0");
-            xlog("L_INFO", "$ci|end|issued new auth challenge to new registration attempt");
+            xlog("L_INFO", "$ci|end|issued new auth challenge to registration attempt from $Au $si:$sp");
             exit;
         }
 
@@ -127,7 +127,6 @@ route[HANDLE_REGISTER]
 
         $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU;
 
-        xlog("L_DBG", "$ci|log|amqp_register_success = $var(amqp_payload_request)");
         kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); 
         
         exit;
@@ -184,4 +183,4 @@ route[DOMAIN_FORMAT_CHECK]
 
 }
 
-# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab
+# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab

system/security/limits.d/kamailio.limits.conf

@@ -0,0 +1,17 @@
+kamailio       soft    core            unlimited
+kamailio       soft    data            unlimited
+kamailio       soft    fsize           unlimited
+kamailio       soft    memlock         unlimited
+kamailio       soft    nofile          999999 
+kamailio       soft    rss             unlimited
+kamailio       hard    stack           240
+kamailio       soft    cpu             unlimited
+kamailio       soft    nproc           unlimited
+kamailio       soft    as              unlimited
+kamailio       soft    priority        -11
+kamailio       soft    locks           unlimited
+kamailio       soft    sigpending      unlimited
+kamailio       soft    msgqueue        unlimited
+kamailio       soft    nice            -11
+kamailio       soft    nofile          65536
+kamailio       hard    nofile          65536