dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Make chan_misdn_log() avoid generating the log message if logging is disabled. 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@187634 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2009-04-10 14:50:42 +00:00
parent ab22019265
commit 7b2b6e7a58
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
channels/chan_misdn.c
View File

@ -6732,40 +6732,44 @@ static void chan_misdn_log(int level, int port, char *tmpl, ...)
char buf[1024]; char buf[1024];
char port_buf[8]; char port_buf[8];
if (! ((0 <= port) && (port <= max_ports))) { if (!(0 <= port && port <= max_ports)) {
ast_log(LOG_WARNING, "cb_log called with out-of-range port number! (%d)\n", port); ast_log(LOG_WARNING, "cb_log called with out-of-range port number! (%d)\n", port);
port = 0; port = 0;
level = -1; level = -1;
} else if (!(level == -1
|| (misdn_debug_only[port]
? (level == 1 && misdn_debug[port]) || level == misdn_debug[port]
: level <= misdn_debug[port])
|| (level <= misdn_debug[0] && !ast_strlen_zero(global_tracefile)))) {
/*
* We are not going to print anything so lets not
* go to all the work of generating a string.
*/
return;
} }
snprintf(port_buf, sizeof(port_buf), "P[%2d] ", port); snprintf(port_buf, sizeof(port_buf), "P[%2d] ", port);
va_start(ap, tmpl); va_start(ap, tmpl);
vsnprintf(buf, sizeof(buf), tmpl, ap); vsnprintf(buf, sizeof(buf), tmpl, ap);
va_end(ap); va_end(ap);
if (level == -1) { if (level == -1) {
ast_log(LOG_WARNING, "%s", buf); ast_log(LOG_WARNING, "%s", buf);
} else if (misdn_debug_only[port] ? } else if (misdn_debug_only[port]
(level == 1 && misdn_debug[port]) || (level == misdn_debug[port]) ? (level == 1 && misdn_debug[port]) || level == misdn_debug[port]
: level <= misdn_debug[port]) { : level <= misdn_debug[port]) {
ast_console_puts(port_buf); ast_console_puts(port_buf);
ast_console_puts(buf); ast_console_puts(buf);
} }
if ((level <= misdn_debug[0]) && !ast_strlen_zero(global_tracefile) ) { if (level <= misdn_debug[0] && !ast_strlen_zero(global_tracefile)) {
char ctimebuf[30]; char ctimebuf[30];
time_t tm = time(NULL); time_t tm;
char *tmp = ctime_r(&tm, ctimebuf), *p; char *tmp;
char *p;
FILE *fp = fopen(global_tracefile, "a+"); FILE *fp;
p = strchr(tmp, '\n');
if (p) {
*p = ':';
}
fp = fopen(global_tracefile, "a+");
if (!fp) { if (!fp) {
ast_console_puts("Error opening Tracefile: [ "); ast_console_puts("Error opening Tracefile: [ ");
ast_console_puts(global_tracefile); ast_console_puts(global_tracefile);
@ -6773,9 +6777,15 @@ static void chan_misdn_log(int level, int port, char *tmpl, ...)
ast_console_puts(strerror(errno)); ast_console_puts(strerror(errno));
ast_console_puts("\n"); ast_console_puts("\n");
return ; return;
} }
tm = time(NULL);
tmp = ctime_r(&tm, ctimebuf);
p = strchr(tmp, '\n');
if (p) {
*p = ':';
}
fputs(tmp, fp); fputs(tmp, fp);
fputs(" ", fp); fputs(" ", fp);
fputs(port_buf, fp); fputs(port_buf, fp);