From: Robert James Kaes <rjkaes@users.sourceforge.net>
Date: Tue, 28 Aug 2001 15:51:58 +0000 (+0000)
Subject: The logging levels _now_ output the correct information depending on where
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=9a61faa716338ea9d358e437114a8e1829b09780;p=obnox%2Ftinyproxy.git

The logging levels _now_ output the correct information depending on where
the config file sets it.
---

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;