Miscellaneous logging cleanups to fix how changing log levels was broken.

1 files changed, 14 insertions, 13 deletions

diff --git a/anaconda b/anaconda
index 2acdc8c7f..60441fbde 100755
--- a/anaconda
+++ b/anaconda
@@ -344,6 +344,13 @@ try:
 except ImportError:
     pass
 
+# Set up logging as early as possible.
+import logging
+from anaconda_log import logger
+
+log = logging.getLogger("anaconda")
+stdoutLog = logging.getLogger("anaconda.stdout")
+
 # pull this in to get product name and versioning
 import product
 
@@ -365,14 +372,9 @@ import signal, traceback, string, isys, iutil, time
 from exception import handleException
 import dispatch
 import warnings
-import logging
-from anaconda_log import logger
 from flags import flags
 from rhpl.translate import _, textdomain, addPoPath
 
-log = logging.getLogger("anaconda")
-stdoutLog = logging.getLogger("anaconda.stdout")
-
 if iutil.getArch() != "s390" and os.access("/dev/tty3", os.W_OK):
     logger.addFileHandler ("/dev/tty3", log)
 
@@ -519,21 +521,20 @@ for n in args:
     elif (str == '--syslog'):
         if arg.find(":") != -1:
             (host, port) = arg.split(':')
-            logger.addSysLogHandler(logging.getLogger("anaconda"), host,
-                                    port=int(port))
+            logger.addSysLogHandler(log, host, port=int(port))
         else:
-            logger.addSysLogHandler(logging.getLogger("anaconda"), arg)
+            logger.addSysLogHandler(log, arg)
     elif (str == '--loglevel'):
         if arg == "debug":
-            log.setLevel(logging.DEBUG)
+            log.setHandlersLevel(logging.DEBUG)
         elif arg == "info":
-            log.setLevel(logging.INFO)
+            log.setHandlersLevel(logging.INFO)
         elif arg == "warning":
-            log.setLevel(logging.WARNING)
+            log.setHandlersLevel(logging.WARNING)
         elif arg == "error":
-            log.setLevel(logging.ERROR)
+            log.setHandlersLevel(logging.ERROR)
         elif arg == "critical":
-            log.setLevel(logging.CRITICAL)
+            log.setHandlersLevel(logging.CRITICAL)
     elif (str == '--lowres'):
         runres = '640x480'
     elif (str == '-m' or str == '--method'):