Revert some changes

ckan · Sep 28, 2018 · 1b85c23 · 1b85c23
1 parent 2ce2a22
commit 1b85c23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ckan/cli/__init__.py b/ckan/cli/__init__.py
@@ -13,8 +13,9 @@
 from ckan.config.middleware import make_app
 
 
-log = logging.getLogger('werkzeug')
-logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO,
+                    format='%(asctime)s %(levelname)s [%(name)s] %(message)s')
 
 
 click_config_option = click.option(

diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
@@ -111,7 +111,6 @@ def make_flask_stack(conf, **app_conf):
         app = DebuggedApplication(app, True)
         app = app.app
 
-
     # Use Beaker as the Flask session interface
     class BeakerSessionInterface(SessionInterface):
         def open_session(self, app, request):
@@ -270,8 +269,6 @@ def hello_world_post():
 
     # Add a reference to the actual Flask app so it's easier to access
     app._wsgi_app = flask_app
-    app.logger.propagate = True
-    # app.logger.propagate = True
 
     return app