Skip to content

Commit aa3091a

Browse files
authored
Merge pull request #31 from ggtools/master
Fix config_root_logger in non_web context
2 parents 6031597 + 84a3b86 commit aa3091a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

json_logging/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ def config_root_logger():
8282
if ENABLE_JSON_LOGGING:
8383
ENABLE_JSON_LOGGING_DEBUG and _logger.debug("Update root logger to using JSONLogFormatter")
8484
if len(logging.root.handlers) > 0:
85-
if _current_framework is not None or _current_framework != '-':
86-
util.update_formatter_for_loggers([logging.root], JSONLogWebFormatter)
87-
else:
85+
if _current_framework is None or _current_framework == '-':
8886
util.update_formatter_for_loggers([logging.root], JSONLogFormatter)
89-
# remove all handlers for request logging
90-
request_logger = _current_framework['app_request_instrumentation_configurator']().get_request_logger()
91-
if request_logger:
92-
for handler in request_logger.handlers:
93-
request_logger.removeHandler(handler)
87+
else:
88+
util.update_formatter_for_loggers([logging.root], JSONLogWebFormatter)
89+
# remove all handlers for request logging
90+
request_logger = _current_framework['app_request_instrumentation_configurator']().get_request_logger()
91+
if request_logger:
92+
for handler in request_logger.handlers:
93+
request_logger.removeHandler(handler)
9494
else:
9595
_logger.error(
9696
"No logging handlers found for root logger. Please made sure that you call this after you called "

0 commit comments

Comments
 (0)