<!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][15103] </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=15103">15103</a></dd>
<dt>Author</dt> <dd>mochouinard</dd>
<dt>Date</dt> <dd>2009-10-06 20:08:36 -0500 (Tue, 06 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_console: Improved tab completions, and more description usage informations (<a href="http://jira.freeswitch.org/browse/LOGGER-2">LOGGER-2</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodloggersmod_consolemod_consolec">freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodloggersmod_consolemod_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (15102 => 15103)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c 2009-10-06 23:27:16 UTC (rev 15102)
+++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c 2009-10-07 01:08:36 UTC (rev 15103)
</span><span class="lines">@@ -255,68 +255,95 @@
</span><span class="cx"> SWITCH_STANDARD_API(console_api_function)
</span><span class="cx"> {
</span><span class="cx"> int argc;
</span><del>- char *mydata = NULL, *argv[3];
- const char *err = NULL;
</del><ins>+ char *mycmd = NULL, *argv[3] = { 0 };
+ switch_status_t status = SWITCH_STATUS_SUCCESS;
+ const char *usage_string = "USAGE:\n"
+ "--------------------------------------------------------------------------------\n"
+ "console help\n"
+ "console loglevel [[0-7] | <loglevel_string>]\n"
+ "console colorize [on|off|toggle]\n"
+ "--------------------------------------------------------------------------------\n";
+ const char *loglevel_usage_string = "USAGE:\n"
+ "--------------------------------------------------------------------------------\n"
+ "console loglevel [[0-7] | <loglevel_string>]\n"
+ "\n"
+ "Set the logging verbosity of the console from 0 (least verbose) to\n"
+ "7 (debugging), or specify the loglevel as a string:\n"
+ "\n"
+ " 0 console\n"
+ " 1 alert\n"
+ " 2 crit\n"
+ " 3 err\n"
+ " 4 warning\n"
+ " 5 notice\n"
+ " 6 info\n"
+ " 7 debug\n"
+ "--------------------------------------------------------------------------------\n";
+ const char *colorize_usage_string = "USAGE:\n"
+ "--------------------------------------------------------------------------------\n"
+ "console colorize [on|off|toggle]\n"
+ "\n"
+ "Enable, disable, or toggle console coloring.\n"
+ "--------------------------------------------------------------------------------\n";
</ins><span class="cx">
</span><del>- if (!cmd) {
- err = "bad args";
- goto end;
</del><ins>+ if (session)
+ return SWITCH_STATUS_FALSE;
+
+ if (switch_strlen_zero(cmd)) {
+ stream->write_function(stream, "%s", usage_string);
+ goto done;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- mydata = strdup(cmd);
- assert(mydata);
</del><ins>+ if (!(mycmd = strdup(cmd))) {
+ status = SWITCH_STATUS_MEMERR;
+ goto done;
+ }
</ins><span class="cx">
</span><del>- argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
</del><ins>+ if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) || !argv[0]) {
+ stream->write_function(stream, "%s", usage_string);
+ goto done;
+ }
</ins><span class="cx">
</span><del>- if (argc > 0) {
</del><ins>+ if (!strcasecmp(argv[0], "loglevel")) {
+ int level = hard_log_level;
</ins><span class="cx">
</span><del>- if (argc < 1) {
- err = "missing arg";
- goto end;
</del><ins>+ if (argc > 1) {
+ if (!strcasecmp(argv[1], "help")) {
+ stream->write_function(stream, "%s", loglevel_usage_string);
+ goto done;
+ } else if (*argv[1] > 47 && *argv[1] < 58) {
+ level = atoi(argv[1]);
+ } else {
+ level = switch_log_str2level(argv[1]);
+ }
</ins><span class="cx"> }
</span><ins>+ if (level == SWITCH_LOG_INVALID) {
+ stream->write_function(stream, "-ERR Invalid console loglevel (%s)!\n\n", argc>1? argv[1] : "");
+ } else {
+ hard_log_level = level;
+ stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level));
+ }
</ins><span class="cx">
</span><del>- if (!strcasecmp(argv[0], "loglevel")) {
- int level = hard_log_level;
-
- if (argc > 1) {
- if (*argv[1] > 47 && *argv[1] < 58) {
- level = atoi(argv[1]);
- } else {
- level = switch_log_str2level(argv[1]);
- }
- }
-
- if (level == SWITCH_LOG_INVALID) {
- stream->write_function(stream, "-ERR syntax error, console log level not set!\n");
</del><ins>+ } else if (!strcasecmp(argv[0], "colorize")) {
+ if (argc > 1) {
+ if (!strcasecmp(argv[1], "help")) {
+ stream->write_function(stream, "%s", colorize_usage_string);
+ goto done;
+ } else if (!strcasecmp(argv[1], "toggle")) {
+ COLORIZE ^= 1;
</ins><span class="cx"> } else {
</span><del>- hard_log_level = level;
- stream->write_function(stream, "+OK console log level set to %s\n", switch_log_level2str(hard_log_level));
- }
- goto end;
- } else if (!strcasecmp(argv[0], "colorize")) {
- if (argc > 1) {
</del><span class="cx"> COLORIZE = switch_true(argv[1]);
</span><span class="cx"> }
</span><del>- stream->write_function(stream, "+OK console color %s\n", COLORIZE ? "enabled" : "disabled");
- goto end;
</del><span class="cx"> }
</span><ins>+ stream->write_function(stream, "+OK console color %s\n", COLORIZE ? "enabled" : "disabled");
</ins><span class="cx">
</span><del>- err = "invalid command";
-
</del><ins>+ } else { /* if (!strcasecmp(argv[0], "help")) { */
+ stream->write_function(stream, "%s", usage_string);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
- end:
-
- if (err) {
- stream->write_function(stream, "-Error %s\n", err);
- }
-
-
- free(mydata);
-
- return SWITCH_STATUS_SUCCESS;
-
</del><ins>+done:
+ switch_safe_free(mycmd);
+ return status;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_console_load)
</span><span class="lines">@@ -329,9 +356,23 @@
</span><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><del>- SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "loglevel [level]|colorize [on|off]");
</del><ins>+ SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "loglevel [level]|colorize [on|toggle|off]");
+ switch_console_set_complete("add console help");
</ins><span class="cx"> switch_console_set_complete("add console loglevel");
</span><ins>+ switch_console_set_complete("add console loglevel help");
+ switch_console_set_complete("add console loglevel console");
+ switch_console_set_complete("add console loglevel alert");
+ switch_console_set_complete("add console loglevel crit");
+ switch_console_set_complete("add console loglevel err");
+ switch_console_set_complete("add console loglevel warning");
+ switch_console_set_complete("add console loglevel notice");
+ switch_console_set_complete("add console loglevel info");
+ switch_console_set_complete("add console loglevel debug");
</ins><span class="cx"> switch_console_set_complete("add console colorize");
</span><ins>+ switch_console_set_complete("add console colorize help");
+ switch_console_set_complete("add console colorize on");
+ switch_console_set_complete("add console colorize off");
+ switch_console_set_complete("add console colorize toggle");
</ins><span class="cx">
</span><span class="cx"> /* setup my logger function */
</span><span class="cx"> switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG, SWITCH_TRUE);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>