# HG changeset patch # User Mads Kiilerich # Date 2019-12-30 00:03:19 # Node ID f9c55f700ad9f3eb81bb88ac44f11d4713d5e17a # Parent 1ba3aeefe0336c526f8c578bb26583fafaa49f52 logging: drop fileConfig initialization in make_app - backout 0d4dd9380a45 0d4dd9380a45 was a bit harmful, as it might overwrite existing good logging configuration. 0d4dd9380a45 no longer seems relevant: Testing shows that logging for `gearbox serve` *is* activated anyway. gearbox/commands/serve.py will invoke "setup_logging" right before "loadapp". We must and can assume that logging has been initialized before make_app. Reported and based on analysis by Wolfgang Scherer. diff --git a/kallithea/config/middleware.py b/kallithea/config/middleware.py --- a/kallithea/config/middleware.py +++ b/kallithea/config/middleware.py @@ -13,8 +13,6 @@ # along with this program. If not, see . """WSGI middleware initialization for the Kallithea application.""" -import logging.config - from kallithea.config.app_cfg import base_config from kallithea.config.environment import load_environment @@ -49,5 +47,4 @@ def make_app(global_conf, full_stack=Tru ``app_conf`` contains all the application-specific settings (those defined under ``[app:main]``. """ - logging.config.fileConfig(global_conf['__file__']) return make_app_without_logging(global_conf, full_stack=full_stack, **app_conf)