mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-29 22:54:18 +00:00
fix FSCORE-156
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8997 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
9229cfdf24
commit
0f873e692b
9 files changed
+102
-18
No files matched your search
@@ -323,6 +323,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_socket_shutdown)
|
||||
|
||||
prefs.done = 1;
|
||||
|
||||
switch_log_unbind_logger(socket_logger);
|
||||
|
||||
close_socket(&listen_list.sock);
|
||||
|
||||
while (prefs.threads) {
|
||||
@@ -1368,7 +1370,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime)
|
||||
return SWITCH_STATUS_GENERR;
|
||||
}
|
||||
|
||||
switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG);
|
||||
switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE);
|
||||
|
||||
|
||||
for (;;) {
|
||||
|
||||
@@ -42,7 +42,7 @@ static int COLORIZE = 0;
|
||||
static HANDLE hStdout;
|
||||
static WORD wOldColorAttrs;
|
||||
static CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
|
||||
static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
@@ -53,7 +53,7 @@ static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_GREEN | FOREGROUND_INTENSITY
|
||||
};
|
||||
#else
|
||||
static const char *COLORS[] = { SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN,
|
||||
static const char *COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN,
|
||||
SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, ""
|
||||
};
|
||||
#endif
|
||||
@@ -338,7 +338,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_console_load)
|
||||
|
||||
|
||||
/* setup my logger function */
|
||||
switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG);
|
||||
switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG, SWITCH_TRUE);
|
||||
|
||||
config_logger();
|
||||
RUNNING = 1;
|
||||
@@ -348,10 +348,12 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_console_load)
|
||||
|
||||
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_console_shutdown)
|
||||
{
|
||||
//switch_core_hash_destroy(&log_hash);
|
||||
//switch_core_hash_destroy(&name_hash);
|
||||
|
||||
switch_log_unbind_logger(switch_console_logger);
|
||||
switch_core_hash_destroy(&log_hash);
|
||||
|
||||
RUNNING = 0;
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
return SWITCH_STATUS_UNLOAD;
|
||||
}
|
||||
|
||||
/* For Emacs:
|
||||
|
||||
@@ -374,9 +374,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load)
|
||||
switch_xml_free(xml);
|
||||
}
|
||||
|
||||
switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG);
|
||||
switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE);
|
||||
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
return SWITCH_STATUS_NOUNLOAD;
|
||||
}
|
||||
|
||||
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown)
|
||||
|
||||
@@ -152,7 +152,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_syslog_load)
|
||||
|
||||
openlog(globals.ident, LOG_PID, LOG_USER);
|
||||
|
||||
switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG);
|
||||
switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE);
|
||||
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
@@ -160,6 +160,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_syslog_load)
|
||||
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown)
|
||||
{
|
||||
closelog();
|
||||
switch_log_unbind_logger(mod_syslog_logger);
|
||||
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user