mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
util.configure_logging() now only configures file logging if it can create the log_dir
This commit is contained in:
@@ -108,11 +108,6 @@ def configure_logging(log_file, verbose):
|
|||||||
"""
|
"""
|
||||||
Configure standard logging.
|
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:
|
# Set logging level:
|
||||||
level = logging.INFO
|
level = logging.INFO
|
||||||
if verbose:
|
if verbose:
|
||||||
@@ -127,6 +122,13 @@ def configure_logging(log_file, verbose):
|
|||||||
log.addHandler(console)
|
log.addHandler(console)
|
||||||
|
|
||||||
# Configure file handler
|
# 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 = logging.FileHandler(log_file)
|
||||||
file_handler.setLevel(level)
|
file_handler.setLevel(level)
|
||||||
file_handler.setFormatter(logging.Formatter(LOGGING_FILE_FORMAT))
|
file_handler.setFormatter(logging.Formatter(LOGGING_FILE_FORMAT))
|
||||||
|
|||||||
Reference in New Issue
Block a user