Revision

15595

Author

brian

Date

2009-11-21 00:18:56 -0600 (Sat, 21 Nov 2009)

Log Message

add debug-level to switch.conf.xml and tweak a few debugs

Modified Paths

• freeswitch/trunk/src/switch_core.c
• freeswitch/trunk/src/switch_odbc.c

Diff

--- freeswitch/trunk/src/switch_core.c	2009-11-21 06:17:05 UTC (rev 15594)
+++ freeswitch/trunk/src/switch_core.c	2009-11-21 06:18:56 UTC (rev 15595)
@@ -1392,6 +1392,11 @@
 					rlp.rlim_max = RLIM_INFINITY;
 					setrlimit(RLIMIT_CORE, &rlp);
 #endif
+				} else if (!strcasecmp(var, "debug-level")) {
+					int tmp = atoi(val);
+					if (tmp > -1 && tmp < 11) {
+						switch_core_session_ctl(SCSC_DEBUG_LEVEL, &tmp);
+					}
 				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
 					runtime.colorize_console = SWITCH_TRUE;
 				} else if (!strcasecmp(var, "mailer-app") && !zstr(val)) {

--- freeswitch/trunk/src/switch_odbc.c	2009-11-21 06:17:05 UTC (rev 15594)
+++ freeswitch/trunk/src/switch_odbc.c	2009-11-21 06:18:56 UTC (rev 15595)
@@ -270,14 +270,14 @@
 		result = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &handle->env);
 
 		if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error AllocHandle\n");
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error AllocHandle\n");
 			return SWITCH_ODBC_FAIL;
 		}
 
 		result = SQLSetEnvAttr(handle->env, SQL_ATTR_ODBC_VERSION, (void *) SQL_OV_ODBC3, 0);
 
 		if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error SetEnv\n");
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error SetEnv\n");
 			SQLFreeHandle(SQL_HANDLE_ENV, handle->env);
 			return SWITCH_ODBC_FAIL;
 		}
@@ -285,7 +285,7 @@
 		result = SQLAllocHandle(SQL_HANDLE_DBC, handle->env, &handle->con);
 
 		if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error AllocHDB %d\n", result);
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error AllocHDB %d\n", result);
 			SQLFreeHandle(SQL_HANDLE_ENV, handle->env);
 			return SWITCH_ODBC_FAIL;
 		}
@@ -293,10 +293,10 @@
 	}
 	if (handle->state == SWITCH_ODBC_STATE_CONNECTED) {
 		switch_odbc_handle_disconnect(handle);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-connecting %s\n", handle->dsn);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Re-connecting %s\n", handle->dsn);
 	}
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting %s\n", handle->dsn);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Connecting %s\n", handle->dsn);
 
 	if (!strstr(handle->dsn, "DRIVER")) {
 		result = SQLConnect(handle->con, (SQLCHAR *) handle->dsn, SQL_NTS, (SQLCHAR *) handle->username, SQL_NTS, (SQLCHAR *) handle->password, SQL_NTS);
@@ -333,7 +333,7 @@
 		handle->is_firebird = FALSE;
 	}
 	
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Connected to [%s]\n", handle->dsn);
 	handle->state = SWITCH_ODBC_STATE_CONNECTED;
 	return SWITCH_ODBC_SUCCESS;
 #else