diff --git a/awx/conf/apps.py b/awx/conf/apps.py index 4f76e13d40..6e09545236 100644 --- a/awx/conf/apps.py +++ b/awx/conf/apps.py @@ -18,5 +18,8 @@ class ConfConfig(AppConfig): 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) # checks.register(SettingsWrapper._check_settings) diff --git a/awx/main/conf.py b/awx/main/conf.py index 1af962cd87..c51205eaa7 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -274,7 +274,7 @@ register( register( 'LOG_AGGREGATOR_LOGGERS', field_class=fields.StringListField, - default=['activity_stream', 'job_events', 'system_tracking'], + default=['awx', 'activity_stream', 'job_events', 'system_tracking'], label=_('Loggers to send data to the log aggregator from'), help_text=_('List of loggers that will send HTTP logs to the collector, these can ' 'include any or all of: \n' diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 5b7724ea31..f991037a3e 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -93,6 +93,9 @@ def _setup_tower_logger(): if settings.LOG_AGGREGATOR_ENABLED: LOGGING_DICT['handlers']['http_receiver']['class'] = 'awx.main.utils.handlers.HTTPSHandler' LOGGING_DICT['handlers']['http_receiver']['async'] = False + 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) logger = logging.getLogger('awx.main.tasks') @@ -128,8 +131,8 @@ def _clear_cache_keys(cache_keys): @task(queue='broadcast_all') def process_cache_changes(cache_keys): logger.warn('Processing cache changes, task args: {0.args!r} kwargs: {0.kwargs!r}'.format( - _clear_cache_keys.request)) - clear_cache_keys(cache_keys) + process_cache_changes.request)) + _clear_cache_keys(cache_keys) set_of_keys = set([key for key in cache_keys]) for setting_key in set_of_keys: if setting_key.startswith('LOG_AGGREGATOR_'):