<!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][14646] </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=14646">14646</a></dd>
<dt>Author</dt> <dd>andrew</dd>
<dt>Date</dt> <dd>2009-08-26 15:50:05 -0500 (Wed, 26 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for log node userdata, improve some log messages and command output</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventc">freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodevent_handlersmod_erlang_eventmod_erlang_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (14645 => 14646)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 2009-08-26 19:49:35 UTC (rev 14645)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 2009-08-26 20:50:05 UTC (rev 14646)
</span><span class="lines">@@ -58,11 +58,7 @@
</span><span class="cx"> for (l = listen_list.listeners; l; l = l->next) {
</span><span class="cx"> if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) {
</span><span class="cx">
</span><del>- switch_log_node_t *dnode = malloc(sizeof(*node));
- switch_assert(dnode);
- *dnode = *node;
- dnode->data = strdup(node->data);
- switch_assert(dnode->data);
</del><ins>+ switch_log_node_t *dnode = switch_log_node_dup(node);
</ins><span class="cx">
</span><span class="cx"> if (switch_queue_trypush(l->log_queue, dnode) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (l->lost_logs) {
</span><span class="lines">@@ -76,8 +72,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_safe_free(dnode->data);
- switch_safe_free(dnode);
</del><ins>+ switch_log_node_free(&dnode);
</ins><span class="cx"> l->lost_logs++;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -502,13 +497,13 @@
</span><span class="cx"> ei_x_encode_atom(&lbuf, "call");
</span><span class="cx"> ei_encode_switch_event(&lbuf, call_event);
</span><span class="cx"> switch_mutex_lock(listener->sock_mutex);
</span><del>- switch_log_printf(SWITCH_CHANNEL_UUID_LOG(session_element->uuid_str), SWITCH_LOG_DEBUG, "Sending initial call event\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_UUID_LOG(session_element->uuid_str), SWITCH_LOG_DEBUG, "Sending initial call event for %s\n", session_element->uuid_str);
</ins><span class="cx"> result = ei_sendto(listener->ec, listener->sockfd, &session_element->process, &lbuf);
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(listener->sock_mutex);
</span><span class="cx">
</span><span class="cx"> if (result) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_UUID_LOG(session_element->uuid_str), SWITCH_LOG_ERROR, "Failed to send call event\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_UUID_LOG(session_element->uuid_str), SWITCH_LOG_ERROR, "Failed to send call event for %s\n", session_element->uuid_str);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ei_x_free(&lbuf);
</span><span class="lines">@@ -563,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> /* event is a channel destroy, so this session can be removed */
</span><span class="cx"> if (pevent->event_id == SWITCH_EVENT_CHANNEL_DESTROY) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "Destroy event for attached session for %s\n", sp->uuid_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_UUID_LOG(sp->uuid_str), SWITCH_LOG_DEBUG, "Destroy event for attached session for %s in state %s\n", sp->uuid_str, switch_channel_state_name(sp->channel_state));
</ins><span class="cx">
</span><span class="cx"> /* this allows the application threads to exit */
</span><span class="cx"> removed = sp;
</span><span class="lines">@@ -607,7 +602,7 @@
</span><span class="cx"> ei_x_new_with_version(&lbuf);
</span><span class="cx"> ei_x_encode_tuple_header(&lbuf, 2);
</span><span class="cx"> ei_x_encode_atom(&lbuf, "log");
</span><del>- ei_x_encode_list_header(&lbuf, 6);
</del><ins>+ ei_x_encode_list_header(&lbuf, 7);
</ins><span class="cx">
</span><span class="cx"> ei_x_encode_tuple_header(&lbuf, 2);
</span><span class="cx"> ei_x_encode_atom(&lbuf, "level");
</span><span class="lines">@@ -632,6 +627,10 @@
</span><span class="cx"> ei_x_encode_tuple_header(&lbuf, 2);
</span><span class="cx"> ei_x_encode_atom(&lbuf, "data");
</span><span class="cx"> ei_x_encode_string(&lbuf, dnode->data);
</span><ins>+
+ ei_x_encode_tuple_header(&lbuf, 2);
+ ei_x_encode_atom(&lbuf, "user_data");
+ ei_x_encode_string(&lbuf, switch_str_nil(dnode->userdata));
</ins><span class="cx">
</span><span class="cx"> ei_x_encode_empty_list(&lbuf);
</span><span class="cx">
</span><span class="lines">@@ -640,8 +639,7 @@
</span><span class="cx"> switch_mutex_unlock(listener->sock_mutex);
</span><span class="cx">
</span><span class="cx"> ei_x_free(&lbuf);
</span><del>- switch_safe_free(dnode->data);
- switch_safe_free(dnode);
</del><ins>+ switch_log_node_free(&dnode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -700,7 +698,10 @@
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Log handler process for node %s exited\n", pid->node);
</span><span class="cx"> /*purge the log queue */
</span><del>- while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS);
</del><ins>+ while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {
+ switch_log_node_t *dnode = (switch_log_node_t *) pop;
+ switch_log_node_free(&dnode);
+ }
</ins><span class="cx">
</span><span class="cx"> if (switch_test_flag(listener, LFLAG_LOG)) {
</span><span class="cx"> switch_clear_flag_locked(listener, LFLAG_LOG);
</span><span class="lines">@@ -1073,8 +1074,11 @@
</span><span class="cx"> session_elem_t *session_element = switch_channel_get_private(channel, "_erlang_session_");
</span><span class="cx"> /*listener_t* listener = switch_channel_get_private(channel, "_erlang_listener_");*/
</span><span class="cx">
</span><del>- if (session_element)
</del><ins>+ if (session_element) {
</ins><span class="cx"> session_element->channel_state = state;
</span><ins>+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to update channel state for %s to %s\n", switch_core_session_get_uuid(session), switch_channel_state_name(state));
+ }
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1379,7 +1383,7 @@
</span><span class="cx"> switch_mutex_lock(l->session_mutex);
</span><span class="cx"> if ((sp = l->session_list)) {
</span><span class="cx"> while(sp) {
</span><del>- stream->write_function(stream, "Outbound session for %s\n", sp->uuid_str);
</del><ins>+ stream->write_function(stream, "Outbound session for %s in state %s\n", sp->uuid_str, switch_channel_state_name(sp->channel_state));
</ins><span class="cx"> sp = sp->next;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>