summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2001-08-28 15:51:58 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2001-08-28 15:51:58 +0000
commit9a61faa716338ea9d358e437114a8e1829b09780 (patch)
tree5e91fe412aeb35872011591a07e1555de13b1876 /src
parent4dbc4a637b2393648eabc32f37c175019badc26c (diff)
downloadtinyproxy-9a61faa716338ea9d358e437114a8e1829b09780.tar.gz
tinyproxy-9a61faa716338ea9d358e437114a8e1829b09780.zip
The logging levels _now_ output the correct information depending on where
the config file sets it.
Diffstat (limited to 'src')
-rw-r--r--src/log.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/log.c b/src/log.c
index 3a3465a..b440911 100644
--- a/src/log.c
+++ b/src/log.c
@@ -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
* 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.
*/
- if (level == LOG_INFO && log_level == LOG_CONN)
- return;
- else if (level > log_level && level != LOG_CONN && log_level != LOG_INFO)
+ if (log_level == LOG_CONN) {
+ if (level == LOG_INFO)
+ return;
+ } else if (log_level == LOG_INFO) {
+ if (level > LOG_INFO && level != LOG_CONN)
+ return;
+ } else if (level > log_level)
return;
+
+
#ifdef HAVE_SYSLOG_H
if (config.syslog && level == LOG_CONN)
level = LOG_INFO;