From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 13 Feb 2011 16:30:40 +0000 (+0100)
Subject: Fix logging if not running in debug mode.
X-Git-Tag: 0.9.3~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6174d54a5066c2ae5e9f423df660256ceed8880f;p=pakfire.git

Fix logging if not running in debug mode.
---

diff --git a/pakfire/config.py b/pakfire/config.py
index 556ac7e4a..2a730cf8f 100644
--- a/pakfire/config.py
+++ b/pakfire/config.py
@@ -14,7 +14,7 @@ class Config(object):
 		self.pakfire = pakfire
 
 		self._config = {
-			"debug" : True,
+			"debug" : False,
 			"logfile" : "/var/log/pakfire.log",
 			"source_download_url" : SOURCE_DOWNLOAD_URL,
 			"local_build_repo_path" : LOCAL_BUILD_REPO_PATH,
diff --git a/pakfire/logger.py b/pakfire/logger.py
index eb06d9749..ab7777899 100644
--- a/pakfire/logger.py
+++ b/pakfire/logger.py
@@ -13,16 +13,25 @@ def setup_logging(config):
 		logging.debug("Logging was already set up. Don't do this again.")
 		return
 
-	# Remove all previous defined handlers
+	# Remove all previous defined handlers.
 	for handler in l.handlers:
 		l.removeHandler(handler)
 
-	if config.get("debug"):
-		l.setLevel(logging.DEBUG)
+	# Set level of logger always to DEBUG.
+	l.setLevel(logging.DEBUG)
 
+	# But only log all the debugging stuff on console if
+	# we are running in debugging mode.
 	handler = logging.StreamHandler()
+
+	if config.get("debug"):
+		handler.setLevel(logging.DEBUG)
+	else:
+		handler.setLevel(logging.INFO)
+
 	l.addHandler(handler)
 
+	# The configuration file always logs all messages.
 	handler = logging.FileHandler(config.get("logfile"))
 	handler.setLevel(logging.DEBUG)
 	l.addHandler(handler)