diff options
| -rwxr-xr-x | anaconda | 3 | ||||
| -rw-r--r-- | anaconda_log.py | 6 | ||||
| -rw-r--r-- | storage/storage_log.py | 3 |
3 files changed, 7 insertions, 5 deletions
@@ -817,7 +817,8 @@ if __name__ == "__main__": if not iutil.isS390() and os.access("/dev/tty3", os.W_OK): anaconda_log.logger.addFileHandler("/dev/tty3", log, - fmtStr=anaconda_log.TTY_FORMAT) + fmtStr=anaconda_log.TTY_FORMAT, + autoLevel=True) warnings.showwarning = AnacondaShowWarning diff --git a/anaconda_log.py b/anaconda_log.py index 3f7baa38b..31a8f7488 100644 --- a/anaconda_log.py +++ b/anaconda_log.py @@ -71,14 +71,14 @@ class AnacondaLog: self.logger = logging.getLogger("anaconda") self.logger.setLevel(logging.DEBUG) self.addFileHandler(MAIN_LOG_FILE, self.logger, - autoLevel=False, minLevel=logging.DEBUG) + minLevel=logging.DEBUG) self.forwardToSyslog(self.logger) # External program output log program_logger = logging.getLogger("program") program_logger.setLevel(logging.DEBUG) self.addFileHandler(PROGRAM_LOG_FILE, program_logger, - autoLevel=False, minLevel=logging.DEBUG) + minLevel=logging.DEBUG) self.forwardToSyslog(program_logger) # Create a second logger for just the stuff we want to dup on @@ -95,7 +95,7 @@ class AnacondaLog: # Add a simple handler - file or stream, depending on what we're given. def addFileHandler (self, file, addToLogger, minLevel=DEFAULT_TTY_LEVEL, fmtStr=ENTRY_FORMAT, - autoLevel=True): + autoLevel=False): if isinstance(file, types.StringTypes): logfileHandler = logging.FileHandler(file) else: diff --git a/storage/storage_log.py b/storage/storage_log.py index e5dbadcf3..a52513d8c 100644 --- a/storage/storage_log.py +++ b/storage/storage_log.py @@ -27,5 +27,6 @@ logger.setLevel(logging.DEBUG) anaconda_log.logger.addFileHandler("/tmp/storage.log", logger, logging.DEBUG) anaconda_log.logger.addFileHandler("/dev/tty3", logger, anaconda_log.DEFAULT_TTY_LEVEL, - anaconda_log.TTY_FORMAT) + anaconda_log.TTY_FORMAT, + autoLevel=True) anaconda_log.logger.forwardToSyslog(logger) |