handle invalid log level strings. (FSCORE-69)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6604 d0543943-73ff-0310-b7d9-9358b9ac24b2

conf/autoload_configs/console.conf.xml

@@ -4,9 +4,9 @@
   <mappings>
     <!-- 
 	 name can be a file name, function name or 'all' 
-	 value is one or more of debug,info,notice,warning,error,crit,alert,all
+	 value is one or more of debug,info,notice,warning,err,crit,alert,all
     -->
-    <map name="all" value="debug,info,notice,warning,error,crit,alert"/>
+    <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
   </mappings>
   <settings>
     <!-- comment or set to false for no color logging -->

conf/autoload_configs/logfile.conf.xml

@@ -14,9 +14,9 @@
       <mappings>
 	<!-- 
 	     name can be a file name, function name or 'all' 
-	     value is one or more of debug,info,notice,warning,error,crit,alert,all
+	     value is one or more of debug,info,notice,warning,err,crit,alert,all
 	-->
-	<map name="all" value="debug,info,notice,warning,error,crit,alert"/>
+	<map name="all" value="debug,info,notice,warning,err,crit,alert"/>
       </mappings>
     </profile>
   </profiles>

conf/autoload_configs/switch.conf.xml

@@ -4,7 +4,7 @@
     <param name="max-sessions" value="1000"/>
     <!--Most channels to create per second -->
     <param name="sessions-per-second" value="30"/>
-    <!--Default Global Log Level -->
+    <!-- Default Global Log Level - value is one of debug,info,notice,warning,err,crit,alert -->
     <param name="loglevel" value="debug"/>
     <!--Try to catch any crashes that can be recoverable (in the context of a call)-->
     <param name="crash-protection" value="false"/>

src/include/switch_types.h

@@ -516,7 +516,8 @@ typedef enum {
 	SWITCH_LOG_ERROR = 3,
 	SWITCH_LOG_CRIT = 2,
 	SWITCH_LOG_ALERT = 1,
-	SWITCH_LOG_CONSOLE = 0
+	SWITCH_LOG_CONSOLE = 0,
+	SWITCH_LOG_INVALID = 64
 } switch_log_level_t;
 
 

src/mod/applications/mod_commands/mod_commands.c

@@ -565,8 +565,13 @@ SWITCH_STANDARD_API(ctl_function)
 			} else {
 				arg = -1;
 			}
-			switch_core_session_ctl(SCSC_LOGLEVEL, &arg);
-			stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg);
+
+			if (arg == -1 || arg == SWITCH_LOG_INVALID) {
+				stream->write_function(stream, "-ERR syntax error, log level not set!\n");
+			} else {
+				switch_core_session_ctl(SCSC_LOGLEVEL, &arg);
+				stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg);
+			}
 		} else if (!strcasecmp(argv[0], "last_sps")) {
 			switch_core_session_ctl(SCSC_LAST_SPS, &arg);
 			stream->write_function(stream, "+OK last sessions per second: %d\n", arg);

src/mod/applications/mod_dptools/mod_dptools.c

@@ -635,6 +635,9 @@ SWITCH_STANDARD_APP(log_function)
 		} else {
 			log_str = level;
 		}
+		if (ltype == SWITCH_LOG_INVALID) {
+			ltype = SWITCH_LOG_DEBUG;
+		}
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, ltype, "%s\n", log_str);
 		switch_safe_free(level);

src/mod/event_handlers/mod_event_socket/mod_event_socket.c

@@ -811,6 +811,7 @@ static switch_status_t parse_command(listener_t * listener, switch_event_t *even
 	} else if (!strncasecmp(cmd, "log", 3)) {
 
 		char *level_s;
+		switch_log_level_t ltype = SWITCH_LOG_DEBUG;
 
 		//pull off the first newline/carriage return
 		strip_cr(cmd);
@@ -824,11 +825,12 @@ static switch_status_t parse_command(listener_t * listener, switch_event_t *even
 			level_s++;
 		}
 		//see if we lined up on an argument or not
-		if (switch_strlen_zero(level_s)) {
-			level_s = "debug";
+		if (!switch_strlen_zero(level_s)) {
+			ltype = switch_log_str2level(level_s);
 		}
 
-		if ((listener->level = switch_log_str2level(level_s))) {
+		if (ltype && ltype != SWITCH_LOG_INVALID) {
+			listener->level = ltype;
 			switch_set_flag(listener, LFLAG_LOG);
 			snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level);
 		} else {

src/mod/languages/mod_spidermonkey/mod_spidermonkey.c

@@ -3002,6 +3002,9 @@ static JSBool js_log(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, j
 	if (argc > 1) {
 		if ((level_str = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) {
 			level = switch_log_str2level(level_str);
+			if (level == SWITCH_LOG_INVALID) {
+				level = SWITCH_LOG_DEBUG;
+			}
 		}
 
 		if ((msg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])))) {

src/mod/loggers/mod_console/mod_console.c

@@ -76,10 +76,10 @@ static void add_mapping(char *var, char *val, int cumlative)
 		uint32_t l = switch_log_str2level(val);
 		uint32_t i;
 
-		assert(l < 10);
-		
-		for (i = 0; i <= l; i++) {
-			m |= (1 << i);
+		if (l < 10) {
+			for (i = 0; i <= l; i++) {
+				m |= (1 << i);
+			}
 		}
 	} else {
 		m = switch_log_str2mask(val);
@@ -227,8 +227,12 @@ SWITCH_STANDARD_API(console_api_function)
 				level = switch_log_str2level(argv[1]);
 			}
 
-			hard_log_level = level;
-			stream->write_function(stream,  "+OK console log level set to %s\n", switch_log_level2str(hard_log_level));
+			if (level == SWITCH_LOG_INVALID) {
+				stream->write_function(stream, "-ERR syntax error, console log level not set!\n");
+			} else {
+				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")) {
 			COLORIZE = switch_true(argv[1]);

src/switch_core.c

@@ -706,7 +706,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
                         level = switch_log_str2level(val);
                     }
 
-                    switch_core_session_ctl(SCSC_LOGLEVEL, &level);
+					if (level != SWITCH_LOG_INVALID) {
+	                    switch_core_session_ctl(SCSC_LOGLEVEL, &level);
+					}
 					
 				} else if (!strcasecmp(var, "mailer-app")) {
 					runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);

src/switch_cpp.cpp

@@ -485,6 +485,9 @@ void console_log(char *level_str, char *msg)
     switch_log_level_t level = SWITCH_LOG_DEBUG;
     if (level_str) {
         level = switch_log_str2level(level_str);
+		if (level == SWITCH_LOG_INVALID) {
+			level = SWITCH_LOG_DEBUG;
+		}
     }
     switch_log_printf(SWITCH_CHANNEL_LOG, level, msg);
 	fflush(stdout); // TEMP ONLY!! SHOULD NOT BE CHECKED IN!!

src/switch_log.c

@@ -75,6 +75,7 @@ SWITCH_DECLARE(uint32_t) switch_log_str2mask(const char *str)
 	char *argv[10] = { 0 };
 	uint32_t mask = 0;
 	char *p = strdup(str);
+	switch_log_level_t level;
 
 	assert(p);
 
@@ -84,7 +85,10 @@ SWITCH_DECLARE(uint32_t) switch_log_str2mask(const char *str)
 				mask = 0xFF;
 				break;
 			} else {
-				mask |= (1 << switch_log_str2level(argv[x]));
+				level = switch_log_str2level(argv[x]);
+				if (level != SWITCH_LOG_INVALID) {
+					mask |= (1 << level);
+				}
 			}
 		}
 	}
@@ -99,7 +103,7 @@ SWITCH_DECLARE(uint32_t) switch_log_str2mask(const char *str)
 SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str)
 {
 	int x = 0;
-	switch_log_level_t level = SWITCH_LOG_DEBUG;
+	switch_log_level_t level = SWITCH_LOG_INVALID;
 
 	for (x = 0;; x++) {
 		if (!LEVELS[x]) {