The logging levels _now_ output the correct information depending on where

the config file sets it.
This commit is contained in:
Robert James Kaes 2001-08-28 15:51:58 +00:00
parent 4dbc4a637b
commit 9a61faa716

View File

@ -1,4 +1,4 @@
/* $Id: log.c,v 1.11 2001-08-27 17:44:55 rjkaes Exp $ /* $Id: log.c,v 1.12 2001-08-28 15:51:58 rjkaes Exp $
* *
* Logs the various messages which tinyproxy produces to either a log file or * Logs the various messages which tinyproxy produces to either a log file or
* the syslog daemon. Not much to it... * the syslog daemon. Not much to it...
@ -76,11 +76,17 @@ void log_message(short int level, char *fmt, ...)
/* /*
* Figure out if we should write the message or not. * Figure out if we should write the message or not.
*/ */
if (level == LOG_INFO && log_level == LOG_CONN) if (log_level == LOG_CONN) {
return; if (level == LOG_INFO)
else if (level > log_level && level != LOG_CONN && log_level != LOG_INFO) return;
} else if (log_level == LOG_INFO) {
if (level > LOG_INFO && level != LOG_CONN)
return;
} else if (level > log_level)
return; return;
#ifdef HAVE_SYSLOG_H #ifdef HAVE_SYSLOG_H
if (config.syslog && level == LOG_CONN) if (config.syslog && level == LOG_CONN)
level = LOG_INFO; level = LOG_INFO;