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

Merge pull request #5305 from AlanCoding/celery_dynamic_option

Browse Source 
Get celery logging autoreload + don't reconfigure the whole config
This commit is contained in:
Alan Rominger
2017-02-13 16:22:40 -05:00
committed by GitHub
parent 6371fcaa92 fbe712dcd1
commit c5da81eb19
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/conf/apps.py
View File

@@ -2,7 +2,7 @@
from django.apps import AppConfig
# from django.core import checks
from django.utils.translation import ugettext_lazy as _
from django.utils.log import configure_logging
from awx.main.utils.handlers import configure_external_logger
from django.conf import settings
@@ -15,10 +15,4 @@ class ConfConfig(AppConfig):
self.module.autodiscover()
from .settings import SettingsWrapper
SettingsWrapper.initialize()
if settings.LOG_AGGREGATOR_ENABLED:
LOGGING_DICT = settings.LOGGING
LOGGING_DICT['handlers']['http_receiver']['class'] = 'awx.main.utils.handlers.HTTPSHandler'
if 'awx' in settings.LOG_AGGREGATOR_LOGGERS:
if 'http_receiver' not in LOGGING_DICT['loggers']['awx']['handlers']:
LOGGING_DICT['loggers']['awx']['handlers'] += ['http_receiver']
configure_logging(settings.LOGGING_CONFIG, LOGGING_DICT)
configure_external_logger(settings)