diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h index 382c4b4fa1..13d41cb096 100644 --- a/src/include/switch_cpp.h +++ b/src/include/switch_cpp.h @@ -70,8 +70,8 @@ SWITCH_DECLARE(void) setGlobalVariable(char *var_name, char *var_val); SWITCH_DECLARE(char *) getGlobalVariable(char *var_name); SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg); +SWITCH_DECLARE(void) consoleLog2(char *level_str, char *file, char *func, int line, char *msg); SWITCH_DECLARE(void) consoleCleanLog(char *msg); -SWITCH_DECLARE(void) consoleChannelLog(char *level_str, char *file, char *func, int line, char *msg); SWITCH_DECLARE(bool) running(void); SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *body = NULL, @@ -399,8 +399,8 @@ SWITCH_DECLARE(bool) email(char *to, char *from, char *headers = NULL, char *bod /* ---- functions not bound to CoreSession instance ----- */ SWITCH_DECLARE(void) console_log(char *level_str, char *msg); +SWITCH_DECLARE(void) console_log2(char *level_str, char *file, char *func, int line, char *msg); SWITCH_DECLARE(void) console_clean_log(char *msg); -SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func, int line, char *msg); SWITCH_DECLARE(void) switch_msleep(unsigned ms); /** \brief bridge the audio of session_b into session_a diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp index e00f4d6280..b1613f3a26 100644 --- a/src/switch_cpp.cpp +++ b/src/switch_cpp.cpp @@ -1287,16 +1287,16 @@ SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg) return console_log(level_str, msg); } +SWITCH_DECLARE(void) consoleLog2(char *level_str, char *file, char *func, int line, char *msg) +{ + return console_log2(level_str, file, func, line, msg); +} + SWITCH_DECLARE(void) consoleCleanLog(char *msg) { return console_clean_log(msg); } -SWITCH_DECLARE(void) consoleChannelLog(char *level_str, char *file, char *func, int line, char *msg) -{ - return console_channel_log(level_str, file, func, line, msg); -} - SWITCH_DECLARE(void) console_log(char *level_str, char *msg) { switch_log_level_t level = SWITCH_LOG_DEBUG; @@ -1309,12 +1309,7 @@ SWITCH_DECLARE(void) console_log(char *level_str, char *msg) switch_log_printf(SWITCH_CHANNEL_LOG, level, "%s", switch_str_nil(msg)); } -SWITCH_DECLARE(void) console_clean_log(char *msg) -{ - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg)); -} - -SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func, int line, char *msg) +SWITCH_DECLARE(void) console_log2(char *level_str, char *file, char *func, int line, char *msg) { switch_log_level_t level = SWITCH_LOG_DEBUG; if (level_str) { @@ -1326,6 +1321,11 @@ SWITCH_DECLARE(void) console_channel_log(char *level_str, char *file, char *func switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, level, "%s", switch_str_nil(msg)); } +SWITCH_DECLARE(void) console_clean_log(char *msg) +{ + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN,SWITCH_LOG_DEBUG, "%s", switch_str_nil(msg)); +} + SWITCH_DECLARE(bool) email(char *to, char *from, char *headers, char *body, char *file, char *convert_cmd, char *convert_ext) { if (switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext) == SWITCH_TRUE) {