From aa0cc3e57522f83e6102e03d5966573d99dae05e Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 31 Jan 2011 16:46:21 +0100
Subject: [PATCH] utils.log: Restrict I/O error handling coverage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The I/O error will occur while opening the file, not while adding
and configuring the handler.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/utils/log.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/utils/log.py b/lib/utils/log.py
index 1bb2c9fbf..f91d44a86 100644
--- a/lib/utils/log.py
+++ b/lib/utils/log.py
@@ -229,16 +229,16 @@ def SetupLogging(logfile, debug=0, stderr_logging=False, program="",
logfile_handler = _LogHandler(open(constants.DEV_CONSOLE, "a"), logfile)
else:
logfile_handler = _ReopenableLogHandler(logfile)
-
- logfile_handler.setFormatter(formatter)
- if debug:
- logfile_handler.setLevel(logging.DEBUG)
- else:
- logfile_handler.setLevel(logging.INFO)
- root_logger.addHandler(logfile_handler)
except EnvironmentError:
if stderr_logging or syslog == constants.SYSLOG_YES:
logging.exception("Failed to enable logging to file '%s'", logfile)
else:
# we need to re-raise the exception
raise
+
+ logfile_handler.setFormatter(formatter)
+ if debug:
+ logfile_handler.setLevel(logging.DEBUG)
+ else:
+ logfile_handler.setLevel(logging.INFO)
+ root_logger.addHandler(logfile_handler)
--
GitLab