From 2f048030bd8e2ddf947f260501fa52e29e69cf79 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 10 Apr 2009 15:11:16 +0000 Subject: revert addition of LOG_SECURITY log channel; after further discussion, a much better solution will be used git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187636 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/logger.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'main/logger.c') diff --git a/main/logger.c b/main/logger.c index 79fb730d3..163548908 100644 --- a/main/logger.c +++ b/main/logger.c @@ -162,8 +162,7 @@ static char *levels[] = { "WARNING", "ERROR", "VERBOSE", - "DTMF", - "SECURITY", + "DTMF" }; /*! \brief Colors used in the console for logging */ @@ -205,8 +204,6 @@ static int make_components(const char *s, int lineno) res |= (1 << __LOG_VERBOSE); else if (!strcasecmp(w, "dtmf")) res |= (1 << __LOG_DTMF); - else if (!strcasecmp(w, "security")) - res |= (1 << __LOG_SECURITY); else { fprintf(stderr, "Logfile Warning: Unknown keyword '%s' at line %d of logger.conf\n", w, lineno); } @@ -359,7 +356,7 @@ static void init_logger_chain(int locked) if (!(chan = ast_calloc(1, sizeof(*chan)))) return; chan->type = LOGTYPE_CONSOLE; - chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR); + chan->logmask = 28; /*warning,notice,error */ if (!locked) AST_RWLIST_WRLOCK(&logchannels); AST_RWLIST_INSERT_HEAD(&logchannels, chan, list); @@ -805,8 +802,6 @@ static char *handle_logger_show_channels(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, "Debug "); if (chan->logmask & (1 << __LOG_DTMF)) ast_cli(a->fd, "DTMF "); - if (chan->logmask & (1 << __LOG_SECURITY)) - ast_cli(a->fd, "Security "); if (chan->logmask & (1 << __LOG_VERBOSE)) ast_cli(a->fd, "Verbose "); if (chan->logmask & (1 << __LOG_WARNING)) -- cgit v1.2.3