External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

remove old logger reconfig method

Browse Source
This commit is contained in:
AlanCoding 2017-02-10 11:37:50 -05:00
parent 91031cbbc8
commit cdf28f1bca
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@ -90,7 +90,7 @@ def celery_startup(conf=None, **kwargs):
@worker_process_init.connect
def task_set_logger_pre_run(*args, **kwargs):
cache.close()
configure_external_logger(settings, is_startup=False)
configure_external_logger(settings, async_flag=False, is_startup=False)
def _uwsgi_reload():

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

@ -181,7 +181,7 @@ def add_or_remove_logger(address, instance, adding=True):
if isinstance(specific_logger.handlers[i], (HTTPSNullHandler, BaseHTTPSHandler)):
i_occurance = i
break
if i_occurance is None and not adding:
return
elif i_occurance is None:
@ -205,29 +205,3 @@ def configure_external_logger(settings_module, async_flag=True, is_startup=True)
add_or_remove_logger('awx.analytics', instance, adding=is_enabled)
add_or_remove_logger('awx', instance, adding=(is_enabled and 'awx' in settings_module.LOG_AGGREGATOR_LOGGERS))
def configure_external_logger_old(settings_module, async_flag=True, is_startup=True):
from django.utils.log import configure_logging
is_enabled = settings_module.LOG_AGGREGATOR_ENABLED
if is_startup and (not is_enabled):
# Pass-through if external logging not being used
return
LOGGING_DICT = settings_module.LOGGING
if is_enabled:
LOGGING_DICT['handlers']['http_receiver']['class'] = 'awx.main.utils.handlers.BaseHTTPSHandler'
if not async_flag:
LOGGING_DICT['handlers']['http_receiver']['async'] = False
else:
LOGGING_DICT['handlers']['http_receiver']['async'] = True
for param, django_setting_name in PARAM_NAMES.items():
LOGGING_DICT['handlers']['http_receiver'][param] = getattr(settings_module, django_setting_name, None)
if 'awx' in settings_module.LOG_AGGREGATOR_LOGGERS:
if 'http_receiver' not in LOGGING_DICT['loggers']['awx']['handlers']:
LOGGING_DICT['loggers']['awx']['handlers'] += ['http_receiver']
# External logging not enabled, but removal of existing configuration needed
configure_logging(settings_module.LOGGING_CONFIG, LOGGING_DICT)