<!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][17457] </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=17457">17457</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2010-04-30 16:20:42 -0500 (Fri, 30 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add /uuid command to fs_cli to filter logs by uuid</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslfs_clic">freeswitch/trunk/libs/esl/fs_cli.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslfs_clic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/fs_cli.c (17456 => 17457)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/fs_cli.c 2010-04-30 21:10:43 UTC (rev 17456)
+++ freeswitch/trunk/libs/esl/fs_cli.c 2010-04-30 21:20:42 UTC (rev 17457)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> static int running = 1;
</span><span class="cx"> static int thread_running = 0;
</span><ins>+static char *filter_uuid;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -588,26 +589,28 @@
</span><span class="cx">
</span><span class="cx"> if (!esl_strlen_zero(type)) {
</span><span class="cx"> if (!strcasecmp(type, "log/data")) {
</span><del>- int level = 0;
- const char *lname = esl_event_get_header(handle->last_event, "log-level");
-#ifdef WIN32
- DWORD len = (DWORD) strlen(handle->last_event->body);
- DWORD outbytes = 0;
-#endif
- if (lname) {
- level = atoi(lname);
- }
</del><ins>+ const char *userdata = esl_event_get_header(handle->last_event, "user-data");
</ins><span class="cx">
</span><ins>+ if (esl_strlen_zero(userdata) || esl_strlen_zero(filter_uuid) || !strcasecmp(filter_uuid, userdata)) {
+ int level = 0;
+ const char *lname = esl_event_get_header(handle->last_event, "log-level");
+ #ifdef WIN32
+ DWORD len = (DWORD) strlen(handle->last_event->body);
+ DWORD outbytes = 0;
+ #endif
+ if (lname) {
+ level = atoi(lname);
+ }
</ins><span class="cx">
</span><del>-#ifdef WIN32
</del><span class="cx">
</span><del>- SetConsoleTextAttribute(hStdout, COLORS[level]);
- WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
- SetConsoleTextAttribute(hStdout, wOldColorAttrs);
-#else
- printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR);
-#endif
-
</del><ins>+ #ifdef WIN32
+ SetConsoleTextAttribute(hStdout, COLORS[level]);
+ WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
+ SetConsoleTextAttribute(hStdout, wOldColorAttrs);
+ #else
+ printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR);
+ #endif
+ }
</ins><span class="cx"> known++;
</span><span class="cx"> } else if (!strcasecmp(type, "text/disconnect-notice")) {
</span><span class="cx"> running = thread_running = 0;
</span><span class="lines">@@ -669,9 +672,22 @@
</span><span class="cx"> ) {
</span><span class="cx"> esl_log(ESL_LOG_INFO, "Goodbye!\nSee you at ClueCon http://www.cluecon.com/\n");
</span><span class="cx"> return -1;
</span><del>- }
</del><ins>+ } else if (!strncasecmp(cmd, "uuid", 4)) {
+ cmd += 4;
+
+ while (*cmd && *cmd == ' ') {
+ cmd++;
+ }
</ins><span class="cx">
</span><del>- if (
</del><ins>+ if (!esl_strlen_zero(cmd)) {
+ filter_uuid = strdup(cmd);
+ } else {
+ esl_safe_free(filter_uuid);
+ }
+
+ printf("UUID filtering %s\n", filter_uuid ? "enabled" : "disabled");
+
+ } else if (
</ins><span class="cx"> !strncasecmp(cmd, "event", 5) ||
</span><span class="cx"> !strncasecmp(cmd, "noevent", 7) ||
</span><span class="cx"> !strncasecmp(cmd, "nixevent", 8) ||
</span><span class="lines">@@ -683,11 +699,7 @@
</span><span class="cx"> esl_send_recv(handle, cmd);
</span><span class="cx">
</span><span class="cx"> printf("%s\n", handle->last_sr_reply);
</span><del>-
- goto end;
- }
-
- if (!strncasecmp(cmd, "debug", 5)){
</del><ins>+ } else if (!strncasecmp(cmd, "debug", 5)){
</ins><span class="cx"> int tmp_debug = atoi(cmd+6);
</span><span class="cx"> if (tmp_debug > -1 && tmp_debug < 8){
</span><span class="cx"> esl_global_set_default_logger(tmp_debug);
</span><span class="lines">@@ -695,10 +707,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> printf("fs_cli debug level must be 0 - 7\n");
</span><span class="cx"> }
</span><del>- goto end;
</del><ins>+ } else {
+ printf("Unknown command [%s]\n", cmd);
</ins><span class="cx"> }
</span><del>-
- printf("Unknown command [%s]\n", cmd);
</del><span class="cx"> } else {
</span><span class="cx"> char cmd_str[1024] = "";
</span><span class="cx"> const char *err = NULL;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>