Merge pull request #4242 from ansible/logging_int

Logging Integration

awx/conf/apps.py

@@ -2,6 +2,8 @@
 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 django.conf import settings
 
 
 class ConfConfig(AppConfig):
@@ -13,4 +15,8 @@ class ConfConfig(AppConfig):
         self.module.autodiscover()
         from .settings import SettingsWrapper
         SettingsWrapper.initialize()
+        if settings.LOG_AGGREGATOR_ENABLED:
+            LOGGING = settings.LOGGING
+            LOGGING['handlers']['http_receiver']['class'] = 'awx.main.utils.handlers.HTTPSHandler'
+            configure_logging(settings.LOGGING_CONFIG, LOGGING)
         # checks.register(SettingsWrapper._check_settings)

awx/conf/signals.py

@@ -3,9 +3,9 @@ import logging
 
 # Django
 from django.conf import settings
-from django.core.cache import cache
 from django.core.signals import setting_changed
 from django.db.models.signals import post_save, pre_delete, post_delete
+from django.core.cache import cache
 from django.dispatch import receiver
 
 # Tower
@@ -13,6 +13,7 @@ import awx.main.signals
 from awx.conf import settings_registry
 from awx.conf.models import Setting
 from awx.conf.serializers import SettingSerializer
+from awx.main.tasks import clear_cache_keys
 
 logger = logging.getLogger('awx.conf.signals')
 
@@ -25,12 +26,16 @@ def handle_setting_change(key, for_delete=False):
     # When a setting changes or is deleted, remove its value from cache along
     # with any other settings that depend on it.
     setting_keys = [key]
+    setting_key_dict = {}
+    setting_key_dict[key] = key
     for dependent_key in settings_registry.get_dependent_settings(key):
         # Note: Doesn't handle multiple levels of dependencies!
         setting_keys.append(dependent_key)
+        setting_key_dict[dependent_key] = dependent_key
     cache_keys = set([Setting.get_cache_key(k) for k in setting_keys])
-    logger.debug('cache delete_many(%r)', cache_keys)
+    logger.debug('sending signals to delete cache keys(%r)', cache_keys)
     cache.delete_many(cache_keys)
+    clear_cache_keys.delay(setting_key_dict)
 
     # Send setting_changed signal with new value for each setting.
     for setting_key in setting_keys: