Skip to content

Commit e94959a

Browse files
committed
Fix logging to always send everything, and filter in handlers
1 parent 858103b commit e94959a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

readthedocs/settings/base.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,14 @@ def INSTALLED_APPS(self): # noqa
355355
},
356356
},
357357
'loggers': {
358-
'readthedocs': {
358+
'': { # root logger
359359
'handlers': ['debug', 'console'],
360-
'level': 'DEBUG',
361-
'propagate': True,
360+
'level': 'DEBUG', # Always send from the root, handlers can filter levels
362361
},
363-
'': {
362+
'readthedocs': {
364363
'handlers': ['debug', 'console'],
365364
'level': 'DEBUG',
366-
'propagate': True,
365+
'propagate': False, # Don't double log at the root logger for these.
367366
},
368367
},
369368
}

readthedocs/settings/dev.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ def DATABASES(self): # noqa
5656
def LOGGING(self): # noqa - avoid pep8 N802
5757
logging = super(CommunityDevSettings, self).LOGGING
5858
logging['formatters']['default']['format'] = '[%(asctime)s] ' + self.LOG_FORMAT
59-
# Remove double logging
60-
logging['loggers']['']['handlers'] = []
6159
return logging
6260

6361

0 commit comments

Comments
 (0)