From 1ce3c7937b9ac2454f6dece846a3132f8ce83ffb Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 13 Sep 2017 13:34:39 -0400 Subject: [PATCH] use request response cache for license checks --- awx/conf/license.py | 3 ++- awx/main/utils/common.py | 5 +++-- awx/settings/defaults.py | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/awx/conf/license.py b/awx/conf/license.py index 57456f90fa..17a1d323c7 100644 --- a/awx/conf/license.py +++ b/awx/conf/license.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework.exceptions import APIException # Tower -from awx.main.utils.common import get_licenser +from awx.main.utils.common import get_licenser, memoize __all__ = ['LicenseForbids', 'get_license', 'get_licensed_features', 'feature_enabled', 'feature_exists'] @@ -40,6 +40,7 @@ def get_licensed_features(): return features +@memoize(cache_name='ephemeral') def feature_enabled(name): """Return True if the requested feature is enabled, False otherwise.""" validated_license_data = _get_validated_license_data() diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 58d795567f..1c1f2890f8 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -107,13 +107,14 @@ class RequireDebugTrueOrTest(logging.Filter): return settings.DEBUG or 'test' in sys.argv -def memoize(ttl=60, cache_key=None): +def memoize(ttl=60, cache_key=None, cache_name='default'): ''' Decorator to wrap a function and cache its result. ''' - from django.core.cache import cache + from django.core.cache import caches def _memoizer(f, *args, **kwargs): + cache = caches[cache_name] key = cache_key or slugify('%s %r %r' % (f.__name__, args, kwargs)) value = cache.get(key) if value is None: diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index c4af5d8d10..514b6ac731 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -481,6 +481,9 @@ if is_testing(): 'default': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', }, + 'ephemeral': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, } else: CACHES = { @@ -488,6 +491,9 @@ else: 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'LOCATION': 'memcached:11211', }, + 'ephemeral': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, } # Social Auth configuration.