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

remove an unnecessary settings optimzation

Browse Source
This commit is contained in:
Ryan Petrello
2020-01-17 14:59:56 -05:00
parent 1bf0bc8203
commit cc2ba09d3a
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/conf/settings.py
View File

@@ -28,8 +28,6 @@ from awx.conf import settings_registry
from awx.conf.models import Setting from awx.conf.models import Setting
from awx.conf.migrations._reencrypt import decrypt_field as old_decrypt_field from awx.conf.migrations._reencrypt import decrypt_field as old_decrypt_field
import cachetools
# FIXME: Gracefully handle when settings are accessed before the database is # FIXME: Gracefully handle when settings are accessed before the database is
# ready (or during migrations). # ready (or during migrations).
@@ -138,14 +136,6 @@ def filter_sensitive(registry, key, value):
return value return value
# settings.__getattr__ is called *constantly*, and the LOG_AGGREGATOR_ ones are
# so ubiquitous when external logging is enabled that they should kept in memory
# with a short TTL to avoid even having to contact memcached
# the primary use case for this optimization is the callback receiver
# when external logging is enabled
LOGGING_SETTINGS_CACHE = cachetools.TTLCache(maxsize=50, ttl=1)
class EncryptedCacheProxy(object): class EncryptedCacheProxy(object):
def __init__(self, cache, registry, encrypter=None, decrypter=None): def __init__(self, cache, registry, encrypter=None, decrypter=None):
@@ -447,17 +437,11 @@ class SettingsWrapper(UserSettingsHolder):
return self._get_default('SETTINGS_MODULE') return self._get_default('SETTINGS_MODULE')
def __getattr__(self, name): def __getattr__(self, name):
if name.startswith('LOG_AGGREGATOR_'):
cached = LOGGING_SETTINGS_CACHE.get(name)
if cached:
return cached
value = empty value = empty
if name in self.all_supported_settings: if name in self.all_supported_settings:
with _ctit_db_wrapper(trans_safe=True): with _ctit_db_wrapper(trans_safe=True):
value = self._get_local(name) value = self._get_local(name)
if value is not empty: if value is not empty:
if name.startswith('LOG_AGGREGATOR_'):
LOGGING_SETTINGS_CACHE[name] = value
return value return value
value = self._get_default(name) value = self._get_default(name)
# sometimes users specify RabbitMQ passwords that contain # sometimes users specify RabbitMQ passwords that contain