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

Revert "use request response cache for license checks"

Browse Source 
This reverts commit 93acae9367023fec153aa7980f2edd9f96822ba2.
This commit is contained in:
Chris Meyers
2017-09-20 13:47:44 -04:00
parent 9db91b4344
commit c265ed2722
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/conf/license.py
View File

@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
# Tower # Tower
from awx.main.utils.common import get_licenser, memoize from awx.main.utils.common import get_licenser
__all__ = ['LicenseForbids', 'get_license', 'get_licensed_features', __all__ = ['LicenseForbids', 'get_license', 'get_licensed_features',
'feature_enabled', 'feature_exists'] 'feature_enabled', 'feature_exists']
@@ -40,7 +40,6 @@ def get_licensed_features():
return features return features
@memoize(cache_name='ephemeral')
def feature_enabled(name): def feature_enabled(name):
"""Return True if the requested feature is enabled, False otherwise.""" """Return True if the requested feature is enabled, False otherwise."""
validated_license_data = _get_validated_license_data() validated_license_data = _get_validated_license_data()

5
awx/main/utils/common.py
View File

@@ -107,14 +107,13 @@ class RequireDebugTrueOrTest(logging.Filter):
return settings.DEBUG or 'test' in sys.argv return settings.DEBUG or 'test' in sys.argv
def memoize(ttl=60, cache_key=None, cache_name='default'): def memoize(ttl=60, cache_key=None):
''' '''
Decorator to wrap a function and cache its result. Decorator to wrap a function and cache its result.
''' '''
from django.core.cache import caches from django.core.cache import cache
def _memoizer(f, *args, **kwargs): def _memoizer(f, *args, **kwargs):
cache = caches[cache_name]
key = cache_key or slugify('%s %r %r' % (f.__name__, args, kwargs)) key = cache_key or slugify('%s %r %r' % (f.__name__, args, kwargs))
value = cache.get(key) value = cache.get(key)
if value is None: if value is None:

6
awx/settings/defaults.py
View File

@@ -481,9 +481,6 @@ if is_testing():
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
}, },
'ephemeral': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
},
} }
else: else:
CACHES = { CACHES = {
@@ -491,9 +488,6 @@ else:
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': 'memcached:11211', 'LOCATION': 'memcached:11211',
}, },
'ephemeral': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
},
} }
# Social Auth configuration. # Social Auth configuration.