Always log now, even if debug is off.

flask/app.py

@@ -260,18 +260,6 @@ class Flask(_PackageBoundObject):
     #: will be removed in favor of Blueprints
     enable_modules = True
 
-    #: The logging format used for the debug logger.  This is only used when
-    #: the application is in debug mode, otherwise the attached logging
-    #: handler does the formatting.
-    #:
-    #: .. versionadded:: 0.3
-    debug_log_format = (
-        '-' * 80 + '\n' +
-        '%(levelname)s in %(module)s [%(pathname)s:%(lineno)d]:\n' +
-        '%(message)s\n' +
-        '-' * 80
-    )
-
     #: The JSON encoder class to use.  Defaults to :class:`~flask.json.JSONEncoder`.
     #:
     #: .. versionadded:: 0.10
@@ -297,6 +285,7 @@ class Flask(_PackageBoundObject):
         'PERMANENT_SESSION_LIFETIME':           timedelta(days=31),
         'USE_X_SENDFILE':                       False,
         'LOGGER_NAME':                          None,
+        'LOGGER_HANDLER_POLICY':               'always',
         'SERVER_NAME':                          None,
         'APPLICATION_ROOT':                     None,
         'SESSION_COOKIE_NAME':                  'session',

flask/logging.py

@@ -11,7 +11,24 @@
 
 from __future__ import absolute_import
 
-from logging import getLogger, StreamHandler, Formatter, getLoggerClass, DEBUG
+from logging import getLogger, StreamHandler, Formatter, getLoggerClass, \
+     DEBUG, ERROR
+
+
+PROD_LOG_FORMAT = '[%(asctime)s] %(levelname)s in %(module)s: %(message)s'
+DEBUG_LOG_FORMAT = (
+    '-' * 80 + '\n' +
+    '%(levelname)s in %(module)s [%(pathname)s:%(lineno)d]:\n' +
+    '%(message)s\n' +
+    '-' * 80
+)
+
+
+def should_log_for(app, mode):
+    policy = app.config['LOGGER_HANDLER_POLICY']
+    if policy == mode or policy == 'always':
+        return True
+    return False
 
 
 def create_logger(app):
@@ -30,16 +47,28 @@ def create_logger(app):
             return Logger.getEffectiveLevel(x)
 
     class DebugHandler(StreamHandler):
-        def emit(x, record):
-            StreamHandler.emit(x, record) if app.debug else None
+        def emit(self, record):
+            if app.debug and should_log_for(app, 'debug'):
+                StreamHandler.emit(self, record)
+
+    class ProductionHandler(StreamHandler):
+        def emit(self, record):
+            if not app.debug and should_log_for(app, 'production'):
+                StreamHandler.emit(self, record)
+
+    debug_handler = DebugHandler()
+    debug_handler.setLevel(DEBUG)
+    debug_handler.setFormatter(Formatter(DEBUG_LOG_FORMAT))
+
+    prod_handler = ProductionHandler()
+    prod_handler.setLevel(ERROR)
+    prod_handler.setFormatter(Formatter(PROD_LOG_FORMAT))
 
-    handler = DebugHandler()
-    handler.setLevel(DEBUG)
-    handler.setFormatter(Formatter(app.debug_log_format))
     logger = getLogger(app.logger_name)
     # just in case that was not a new logger, get rid of all the handlers
     # already attached to it.
     del logger.handlers[:]
     logger.__class__ = DebugLogger
-    logger.addHandler(handler)
+    logger.addHandler(debug_handler)
+    logger.addHandler(prod_handler)
     return logger

flask/testsuite/basic.py

@@ -559,6 +559,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
     def test_teardown_request_handler_error(self):
         called = []
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         @app.teardown_request
         def teardown_request1(exc):
             self.assert_equal(type(exc), ZeroDivisionError)
@@ -621,6 +622,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
 
     def test_error_handling(self):
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         @app.errorhandler(404)
         def not_found(e):
             return 'not found', 404
@@ -920,6 +922,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
 
     def test_none_response(self):
         app = flask.Flask(__name__)
+        app.testing = True
         @app.route('/')
         def test():
             return None
@@ -989,6 +992,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
     def test_exception_propagation(self):
         def apprunner(configkey):
             app = flask.Flask(__name__)
+            app.config['LOGGER_HANDLER_POLICY'] = 'never'
             @app.route('/')
             def index():
                 1 // 0
@@ -996,7 +1000,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
             if config_key is not None:
                 app.config[config_key] = True
                 try:
-                    resp = c.get('/')
+                    c.get('/')
                 except Exception:
                     pass
                 else:

flask/testsuite/blueprints.py

@@ -137,6 +137,7 @@ class ModuleTestCase(FlaskTestCase):
     @emits_module_deprecation_warning
     def test_error_handling(self):
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         admin = flask.Module(__name__, 'admin')
         @admin.app_errorhandler(404)
         def not_found(e):

flask/testsuite/helpers.py

@@ -473,6 +473,7 @@ class LoggingTestCase(FlaskTestCase):
     def test_exception_logging(self):
         out = StringIO()
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         app.logger_name = 'flask_tests/test_exception_logging'
         app.logger.addHandler(StreamHandler(out))
 
@@ -492,6 +493,7 @@ class LoggingTestCase(FlaskTestCase):
 
     def test_processor_exceptions(self):
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         @app.before_request
         def before_request():
             if trigger == 'before':

flask/testsuite/testing.py

@@ -136,6 +136,7 @@ class TestToolsTestCase(FlaskTestCase):
 
     def test_test_client_context_binding(self):
         app = flask.Flask(__name__)
+        app.config['LOGGER_HANDLER_POLICY'] = 'never'
         @app.route('/')
         def index():
             flask.g.value = 42