External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

stop using Django NullHandler which is being removed in future version

Browse Source
This commit is contained in:
AlanCoding
2017-02-09 11:53:51 -05:00
parent 1851276b10
commit 1c6f037076
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/utils/handlers.py
View File

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

6
awx/settings/defaults.py
View File

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