Merge pull request #5277 from AlanCoding/various_logging_updates

Update logging docs & switch out null logger
This commit is contained in:
Alan Rominger
2017-02-09 15:56:09 -05:00
committed by GitHub
4 changed files with 56 additions and 22 deletions

View File

@@ -14,7 +14,6 @@ from requests_futures.sessions import FuturesSession
# custom
from django.conf import settings as django_settings
from django.utils.log import NullHandler
# AWX external logging handler, generally designed to be used
# with the accompanying LogstashHandler, derives from python-logstash library
@@ -38,7 +37,7 @@ def unused_callback(sess, resp):
pass
class HTTPSNullHandler(NullHandler):
class HTTPSNullHandler(logging.NullHandler):
"Placeholder null handler to allow loading without database access"
def __init__(self, host, **kwargs):

View File

@@ -893,16 +893,16 @@ LOGGING = {
'formatter': 'simple',
},
'null': {
'class': 'django.utils.log.NullHandler',
'class': 'logging.NullHandler',
},
'file': {
'class': 'django.utils.log.NullHandler',
'class': 'logging.NullHandler',
'formatter': 'simple',
},
'syslog': {
'level': 'WARNING',
'filters': ['require_debug_false'],
'class': 'django.utils.log.NullHandler',
'class': 'logging.NullHandler',
'formatter': 'simple',
},
'http_receiver': {