diff options
Diffstat (limited to 'base/server/python/pki/server/deployment/pkilogging.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkilogging.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/base/server/python/pki/server/deployment/pkilogging.py b/base/server/python/pki/server/deployment/pkilogging.py index c91a7656f..14c11cf4d 100644 --- a/base/server/python/pki/server/deployment/pkilogging.py +++ b/base/server/python/pki/server/deployment/pkilogging.py @@ -29,6 +29,7 @@ sensitive_parameters = [] # Initialize 'pretty print' for objects pp = pprint.PrettyPrinter(indent=4) + def log_format(given_dict): new_dict = {} @@ -42,6 +43,7 @@ def log_format(given_dict): return pp.pformat(new_dict) + # PKI Deployment Logging Functions def enable_pki_logger(log_dir, log_name, log_level, console_log_level, name): if not os.path.isdir(log_dir): @@ -57,8 +59,8 @@ def enable_pki_logger(log_dir, log_name, log_level, console_log_level, name): # Configure console handler console = logging.StreamHandler() console.setLevel(console_log_level) - console_format = logging.Formatter('%(name)-12s: ' + \ - '%(levelname)-8s ' + \ + console_format = logging.Formatter('%(name)-12s: ' + + '%(levelname)-8s ' + '%(indent)s%(message)s') console.setFormatter(console_format) logger.addHandler(console) @@ -66,8 +68,8 @@ def enable_pki_logger(log_dir, log_name, log_level, console_log_level, name): # Configure file handler log_file = logging.FileHandler(log_dir + "/" + log_name, 'w') log_file.setLevel(log_level) - file_format = logging.Formatter('%(asctime)s %(name)-12s: ' + \ - '%(levelname)-8s ' + \ + file_format = logging.Formatter('%(asctime)s %(name)-12s: ' + + '%(levelname)-8s ' + '%(indent)s%(message)s', '%Y-%m-%d %H:%M:%S') log_file.setFormatter(file_format) |