<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15854] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15854">15854</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-09 08:42:30 -0600 (Wed, 09 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_sofia: add shutdown-on-fail param to sofia profiles (<a href="http://jira.freeswitch.org/browse/MODSOFIA-45">MODSOFIA-45</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfsip_profilesexternalxml">freeswitch/trunk/conf/sip_profiles/external.xml</a></li>
<li><a href="#freeswitchtrunkconfsip_profilesinternalxml">freeswitch/trunk/conf/sip_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_eventc">freeswitch/trunk/src/switch_event.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfsip_profilesexternalxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/sip_profiles/external.xml (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/sip_profiles/external.xml 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/conf/sip_profiles/external.xml 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx">
</span><span class="cx"> <settings>
</span><span class="cx"> <param name="debug" value="0"/>
</span><ins>+ <!-- If you want FreeSWITCH to shutdown if this profile fails to load, uncomment the next line. -->
+ <!-- <param name="shutdown-on-fail" value="true"/> -->
</ins><span class="cx"> <param name="sip-trace" value="no"/>
</span><span class="cx"> <param name="rfc2833-pt" value="101"/>
</span><span class="cx"> <param name="sip-port" value="$${external_sip_port}"/>
</span></span></pre></div>
<a id="freeswitchtrunkconfsip_profilesinternalxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/sip_profiles/internal.xml (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/sip_profiles/internal.xml 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/conf/sip_profiles/internal.xml 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
</span><span class="cx"> <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
</span><span class="cx"> <param name="debug" value="0"/>
</span><ins>+ <!-- If you want FreeSWITCH to shutdown if this profile fails to load, uncomment the next line. -->
+ <!-- <param name="shutdown-on-fail" value="true"/> -->
</ins><span class="cx"> <param name="sip-trace" value="no"/>
</span><span class="cx"> <param name="log-auth-failures" value="true"/>
</span><span class="cx"> <param name="context" value="public"/>
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/src/include/switch_types.h 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -1255,7 +1255,8 @@
</span><span class="cx"> SWITCH_EVENT_NOTIFY - Notification
</span><span class="cx"> SWITCH_EVENT_SEND_MESSAGE - Message
</span><span class="cx"> SWITCH_EVENT_RECV_MESSAGE - Message
</span><del>- SWITCH_EVENT_NAT - NAT Management (new/del/status)
</del><ins>+ SWITCH_EVENT_NAT - NAT Management (new/del/status)
+ SWITCH_EVENT_FAILURE - A failure occurred which might impact the normal functioning of the switch
</ins><span class="cx"> SWITCH_EVENT_ALL - All events at once
</span><span class="cx"> </pre>
</span><span class="cx">
</span><span class="lines">@@ -1332,6 +1333,7 @@
</span><span class="cx"> SWITCH_EVENT_RECORD_START,
</span><span class="cx"> SWITCH_EVENT_RECORD_STOP,
</span><span class="cx"> SWITCH_EVENT_CALL_UPDATE,
</span><ins>+ SWITCH_EVENT_FAILURE,
</ins><span class="cx"> SWITCH_EVENT_ALL
</span><span class="cx"> } switch_event_types_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -423,6 +423,7 @@
</span><span class="cx"> char *dbname;
</span><span class="cx"> char *dialplan;
</span><span class="cx"> char *context;
</span><ins>+ char *shutdown_type;
</ins><span class="cx"> char *extrtpip;
</span><span class="cx"> char *rtpip;
</span><span class="cx"> char *sipip;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -882,6 +882,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void sofia_perform_profile_start_failure(sofia_profile_t *profile, char *profile_name, char* file, int line)
+{
+ int arg = 0;
+ switch_event_t *s_event;
+
+ if (profile) {
+ if (!strcasecmp(profile->shutdown_type, "true")) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile %s could not load! Shutting down!\n", profile->name);
+ switch_core_session_ctl(SCSC_SHUTDOWN, &arg);
+ } else if (!strcasecmp(profile->shutdown_type, "elegant")) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile %s could not load! Waiting for calls to finish, then shutting down!\n", profile->name);
+ switch_core_session_ctl(SCSC_SHUTDOWN_ELEGANT, &arg);
+ } else if (!strcasecmp(profile->shutdown_type, "asap")) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile %s could not load! Shutting down ASAP!\n", profile->name);
+ switch_core_session_ctl(SCSC_SHUTDOWN_ASAP, &arg);
+ }
+ }
+
+ if ((switch_event_create(&s_event, SWITCH_EVENT_FAILURE) == SWITCH_STATUS_SUCCESS)) {
+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "module_name", "mod_sofia");
+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile_name", profile_name);
+ if (profile) {
+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile_uri", profile->url);
+ }
+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "failure_message", "Profile failed to start.");
+ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "file", file);
+ switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "line", "%d", line);
+
+ switch_event_fire(&s_event);
+ }
+}
+#define sofia_profile_start_failure(p, xp) sofia_perform_profile_start_failure(p, xp, __FILE__, __LINE__)
+
+
</ins><span class="cx"> #define SQLLEN 1024 * 64
</span><span class="cx"> void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="lines">@@ -1039,6 +1073,7 @@
</span><span class="cx">
</span><span class="cx"> if (!sofia_glue_init_sql(profile)) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database [%s]!\n", profile->name);
</span><ins>+ sofia_profile_start_failure(profile, profile->name);
</ins><span class="cx"> sofia_glue_del_profile(profile);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -1087,6 +1122,7 @@
</span><span class="cx">
</span><span class="cx"> if (!profile->nua) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Creating SIP UA for profile: %s\n", profile->name);
</span><ins>+ sofia_profile_start_failure(profile, profile->name);
</ins><span class="cx"> sofia_glue_del_profile(profile);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -1848,6 +1884,7 @@
</span><span class="cx"> profile->ob_calls = 0;
</span><span class="cx"> profile->ib_failed_calls = 0;
</span><span class="cx"> profile->ob_failed_calls = 0;
</span><ins>+ profile->shutdown_type = "false";
</ins><span class="cx">
</span><span class="cx"> if (xprofiledomain) {
</span><span class="cx"> profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain);
</span><span class="lines">@@ -1859,6 +1896,8 @@
</span><span class="cx"> char *val = (char *) switch_xml_attr_soft(param, "value");
</span><span class="cx"> if (!strcasecmp(var, "debug")) {
</span><span class="cx"> profile->debug = atoi(val);
</span><ins>+ } else if (!strcasecmp(var, "shutdown-on-fail")) {
+ profile->shutdown_type = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "tracelevel")) {
</span><span class="cx"> mod_sofia_globals.tracelevel = switch_log_str2level(val);
</span><span class="cx"> } else if (!strcasecmp(var, "pass-callee-id")) {
</span><span class="lines">@@ -2373,11 +2412,12 @@
</span><span class="cx">
</span><span class="cx"> if ((profiles = switch_xml_child(cfg, "profiles"))) {
</span><span class="cx"> for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) {
</span><ins>+ char *xprofilename = (char *) switch_xml_attr_soft(xprofile, "name");
+ char *xprofiledomain = (char *) switch_xml_attr(xprofile, "domain");
</ins><span class="cx"> if (!(settings = switch_xml_child(xprofile, "settings"))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Settings, check the new config!\n");
</span><ins>+ sofia_profile_start_failure(NULL, xprofilename);
</ins><span class="cx"> } else {
</span><del>- char *xprofilename = (char *) switch_xml_attr_soft(xprofile, "name");
- char *xprofiledomain = (char *) switch_xml_attr(xprofile, "domain");
</del><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx">
</span><span class="cx"> if (!xprofilename) {
</span><span class="lines">@@ -2395,11 +2435,13 @@
</span><span class="cx"> /* Setup the pool */
</span><span class="cx"> if ((status = switch_core_new_memory_pool(&pool)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</span><ins>+ sofia_profile_start_failure(NULL, xprofilename);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(profile = (sofia_profile_t *) switch_core_alloc(pool, sizeof(*profile)))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</span><ins>+ sofia_profile_start_failure(NULL, xprofilename);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2432,7 +2474,7 @@
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_PASS_CALLEE_ID);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_FIRST_REGISTER);
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_SQL_IN_TRANS);
</span><del>-
</del><ins>+ profile->shutdown_type = "false";
</ins><span class="cx"> profile->local_network = "localnet.auto";
</span><span class="cx">
</span><span class="cx"> for (param = switch_xml_child(settings, "param"); param; param = param->next) {
</span><span class="lines">@@ -2443,6 +2485,8 @@
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(var, "debug")) {
</span><span class="cx"> profile->debug = atoi(val);
</span><ins>+ } else if (!strcasecmp(var, "shutdown-on-fail")) {
+ profile->shutdown_type = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "sip-trace") && switch_true(val)) {
</span><span class="cx"> sofia_set_flag(profile, TFLAG_TPORT_LOG);
</span><span class="cx"> } else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
</span><span class="lines">@@ -3208,6 +3252,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Unable to start Profile %s due to no configured sip-ip\n", profile->name);
</span><ins>+ sofia_profile_start_failure(profile, profile->name);
</ins><span class="cx"> }
</span><span class="cx"> profile = NULL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_event.c (15853 => 15854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_event.c 2009-12-08 22:51:39 UTC (rev 15853)
+++ freeswitch/trunk/src/switch_event.c 2009-12-09 14:42:30 UTC (rev 15854)
</span><span class="lines">@@ -185,6 +185,7 @@
</span><span class="cx"> "RECORD_START",
</span><span class="cx"> "RECORD_STOP",
</span><span class="cx"> "CALL_UPDATE",
</span><ins>+ "FAILURE",
</ins><span class="cx"> "ALL"
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>