Ticket #18993: 18993-1.diff

django/utils/log.py

@@ -1 +1 @@
 import logging
+import sys
 import traceback
 
 from django.conf import settings
@@ -23 +24 @@
 
 getLogger = logging.getLogger
 
-# Ensure the creation of the Django logger
-# with a null handler. This ensures we don't get any
+
+class RequireDebugFalse(logging.Filter):
+    def filter(self, record):
+        return not settings.DEBUG
+
+class RequireDebugTrue(logging.Filter):
+    def filter(self, record):
+        return settings.DEBUG
+
+
+# Ensure the creation of the Django logger with at least one handler.
+# This ensures we don't get any
 # 'No handlers could be found for logger "django"' messages
 logger = getLogger('django')
 if not logger.handlers:
-    logger.addHandler(NullHandler())
+    stream_h = logging.StreamHandler()
+    stream_h.addFilter(RequireDebugTrue())
+    logger.addHandler(stream_h)
 
 
 class AdminEmailHandler(logging.Handler):
@@ -98 +111 @@
         if self.callback(record):
             return 1
         return 0
-
-
-class RequireDebugFalse(logging.Filter):
-    def filter(self, record):
-        return not settings.DEBUG

docs/topics/logging.txt

@@ -424 +424 @@
 ``django`` is the catch-all logger. No messages are posted directly to
 this logger.
 
+.. versionchanged:: 1.5
+
+    Previously, all messages reaching this logger were discarded unless the
+    logger had been customized. In Django 1.5, and when :setting:`DEBUG` is
+    ``True``, all messages are printed to ``stderr`` by default.
+
 ``django.request``
 ~~~~~~~~~~~~~~~~~~
 
@@ -567 +573 @@
                 'class': 'django.utils.log.AdminEmailHandler'
             }
         },
+
+.. class:: RequireDebugTrue()
+
+   .. versionadded:: 1.5
+
+   This filter will only pass on records when settings.DEBUG is True.

tests/regressiontests/logging_tests/tests.py

@@ -1 +1 @@
 from __future__ import unicode_literals
 
 import copy
+import logging
+import sys
 import warnings
 
 from django.conf import compat_patch_logging_config
@@ -8 +10 @@
 from django.test import TestCase, RequestFactory
 from django.test.utils import override_settings
 from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger
+from django.utils.six import StringIO
 
 
 # logging config prior to using filter with mail_admins
@@ -106 +109 @@
         self.assertEqual(config, new_config)
 
 
+class DefaultLoggingTest(TestCase):
+    def setUp(self):
+        self.logger = logging.getLogger('django')
+        self.old_stream = self.logger.handlers[0].stream
+
+    def tearDown(self):
+        self.logger.handlers[0].stream = self.old_stream
+
+    def test_django_logger(self):
+        """
+        The 'django' base logger only output anything when DEBUG=True.
+        """
+        output = StringIO()
+        self.logger.handlers[0].stream = output
+        self.logger.error("Hey, this is an error.")
+        self.assertEqual(output.getvalue(), '')
+
+        with self.settings(DEBUG=True):
+            self.logger.error("Hey, this is an error.")
+            self.assertEqual(output.getvalue(), 'Hey, this is an error.\n')
+
+
 class CallbackFilterTest(TestCase):
     def test_sense(self):
         f_false = CallbackFilter(lambda r: False)