Commit 6c66a41c authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Relied on NullHandler from the logging stdlib module.

parent 6a0374d0
Loading
Loading
Loading
Loading
+3 −11
Original line number Diff line number Diff line
@@ -6,16 +6,8 @@ from django.core import mail
from django.core.mail import get_connection
from django.views.debug import ExceptionReporter, get_exception_reporter_filter


# Make sure a NullHandler is available
# This was added in Python 2.7/3.2
try:
# Imports kept for backwards-compatibility in Django 1.7.
from logging import NullHandler
except ImportError:
    class NullHandler(logging.Handler):
        def emit(self, record):
            pass

from logging.config import dictConfig

getLogger = logging.getLogger
@@ -41,7 +33,7 @@ DEFAULT_LOGGING = {
            'class': 'logging.StreamHandler',
        },
        'null': {
            'class': 'django.utils.log.NullHandler',
            'class': 'logging.NullHandler',
        },
        'mail_admins': {
            'level': 'ERROR',
+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ complex logging setup, configured using :func:`logging.config.dictConfig`::
        'handlers': {
            'null': {
                'level': 'DEBUG',
                'class': 'django.utils.log.NullHandler',
                'class': 'logging.NullHandler',
            },
            'console':{
                'level': 'DEBUG',