diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-28 01:45:02 -0600 |
---|---|---|
committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-28 01:45:02 -0600 |
commit | a9f1c74a7fb7619cfcdb9f5eaf0f62745b1b551e (patch) | |
tree | cd85afd996c0aee571ee5c4dccf4404a23b8647e /ipalib | |
parent | 316bd855d5720f4babfb79d20c391de3f8958a60 (diff) | |
download | freeipa-a9f1c74a7fb7619cfcdb9f5eaf0f62745b1b551e.tar.gz freeipa-a9f1c74a7fb7619cfcdb9f5eaf0f62745b1b551e.tar.xz freeipa-a9f1c74a7fb7619cfcdb9f5eaf0f62745b1b551e.zip |
util.configure_logging() now only configures file logging if it can create the log_dir
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/util.py | 12 |
1 files changed, 7 insertions, 5 deletions
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)) |