kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass a logmsg to ast_log_vsyslog instead of separate arguments.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-06-25 17:01:32 +00:00
parent ce70b28f38
commit ca3a181c33
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/logger.c
View File

@@ -840,29 +840,29 @@ static int handle_SIGXFSZ(int sig)
return 0; return 0;
} }
static void ast_log_vsyslog(int level, const char *file, int line, const char *function, const char *str, long pid) static void ast_log_vsyslog(struct logmsg *msg)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
if (level >= SYSLOG_NLEVELS) { if (msg->level >= SYSLOG_NLEVELS) {
/* we are locked here, so cannot ast_log() */ /* we are locked here, so cannot ast_log() */
fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", level); fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", msg->level);
return; return;
} }
if (level == __LOG_VERBOSE) { if (msg->level == __LOG_VERBOSE) {
snprintf(buf, sizeof(buf), "VERBOSE[%ld]: %s", pid, str); snprintf(buf, sizeof(buf), "VERBOSE[%ld]: %s", msg->process_id, msg->message);
level = __LOG_DEBUG; msg->level = __LOG_DEBUG;
} else if (level == __LOG_DTMF) { } else if (msg->level == __LOG_DTMF) {
snprintf(buf, sizeof(buf), "DTMF[%ld]: %s", pid, str); snprintf(buf, sizeof(buf), "DTMF[%ld]: %s", msg->process_id, msg->message);
level = __LOG_DEBUG; msg->level = __LOG_DEBUG;
} else { } else {
snprintf(buf, sizeof(buf), "%s[%ld]: %s:%d in %s: %s", snprintf(buf, sizeof(buf), "%s[%ld]: %s:%d in %s: %s",
levels[level], pid, file, line, function, str); levels[msg->level], msg->process_id, msg->file, msg->line, msg->function, msg->message);
} }
term_strip(buf, buf, strlen(buf) + 1); term_strip(buf, buf, strlen(buf) + 1);
syslog(syslog_level_map[level], "%s", buf); syslog(syslog_level_map[msg->level], "%s", buf);
} }
/*! \brief Print a normal log message to the channels */ /*! \brief Print a normal log message to the channels */
@@ -880,7 +880,7 @@ static void logger_print_normal(struct logmsg *logmsg)
continue; continue;
/* Check syslog channels */ /* Check syslog channels */
if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << logmsg->level))) { if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << logmsg->level))) {
ast_log_vsyslog(logmsg->level, logmsg->file, logmsg->line, logmsg->function, logmsg->message, logmsg->process_id); ast_log_vsyslog(logmsg);
/* Console channels */ /* Console channels */
} else if (chan->type == LOGTYPE_CONSOLE && (chan->logmask & (1 << logmsg->level))) { } else if (chan->type == LOGTYPE_CONSOLE && (chan->logmask & (1 << logmsg->level))) {
char linestr[128]; char linestr[128];