From a9f1c74a7fb7619cfcdb9f5eaf0f62745b1b551e Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Tue, 28 Oct 2008 01:45:02 -0600
Subject: util.configure_logging() now only configures file logging if it can
 create the log_dir

---
 ipalib/util.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ipalib/util.py')

diff --git a/ipalib/util.py b/ipalib/util.py
index e65f15ca4..280910dc6 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -108,11 +108,6 @@ def configure_logging(log_file, verbose):
     """
     Configure standard logging.
     """
-    # Check that directory log_file is in exists:
-    log_dir = path.dirname(log_file)
-    if not path.isdir(log_dir):
-        os.makedirs(log_dir)
-
     # Set logging level:
     level = logging.INFO
     if verbose:
@@ -127,6 +122,13 @@ def configure_logging(log_file, verbose):
     log.addHandler(console)
 
     # Configure file handler
+    log_dir = path.dirname(log_file)
+    if not path.isdir(log_dir):
+        try:
+            os.makedirs(log_dir)
+        except OSError:
+            log.warn('Could not create log_dir %r', log_dir)
+            return log
     file_handler = logging.FileHandler(log_file)
     file_handler.setLevel(level)
     file_handler.setFormatter(logging.Formatter(LOGGING_FILE_FORMAT))
-- 
cgit