From d2e843720883cb9e3590046d4ed48d192a114dd4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 16 Apr 2022 00:42:55 +0900 Subject: [PATCH] Remove redundant override of logging_context_format_string The target value is exactly same as the default defined in oslo.log, thus this override is just redundant. Change-Id: I91fcc035526d655f0b885f5b6a176dc18577a3a3 --- castellan/options.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/castellan/options.py b/castellan/options.py index 83a7016c..012bfd20 100644 --- a/castellan/options.py +++ b/castellan/options.py @@ -32,11 +32,6 @@ from castellan.common import utils _DEFAULT_LOG_LEVELS = ['castellan=WARN'] -_DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' - '%(levelname)s %(name)s [%(request_id)s ' - '%(user_identity)s] %(instance)s' - '%(message)s') - def set_defaults(conf, backend=None, barbican_endpoint=None, barbican_api_version=None, auth_endpoint=None, @@ -150,8 +145,7 @@ def enable_logging(conf=None, app_name='castellan'): conf = conf or cfg.CONF log.register_options(conf) - log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, - _DEFAULT_LOG_LEVELS) + log.set_defaults(default_log_levels=_DEFAULT_LOG_LEVELS) log.setup(conf, app_name)