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

Merge pull request #839 from AlanCoding/cache_settings_dict

Browse Source 
Cache the global settings list, cProfile speedup
This commit is contained in:
Ryan Petrello
2018-01-08 10:35:00 -05:00
committed by GitHub
parent 818c95501a 0bb9c58e25
commit 97c040aaa1
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/conf/settings.py
View File

@@ -14,6 +14,7 @@ from django.conf import settings, UserSettingsHolder
from django.core.cache import cache as django_cache from django.core.cache import cache as django_cache
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db import ProgrammingError, OperationalError from django.db import ProgrammingError, OperationalError
from django.utils.functional import cached_property
# Django REST Framework # Django REST Framework
from rest_framework.fields import empty, SkipField from rest_framework.fields import empty, SkipField
@@ -230,7 +231,8 @@ class SettingsWrapper(UserSettingsHolder):
self.__dict__['cache'] = EncryptedCacheProxy(cache, registry) self.__dict__['cache'] = EncryptedCacheProxy(cache, registry)
self.__dict__['registry'] = registry self.__dict__['registry'] = registry
def _get_supported_settings(self): @cached_property
def all_supported_settings(self):
return self.registry.get_registered_settings() return self.registry.get_registered_settings()
def _preload_cache(self): def _preload_cache(self):
@@ -382,7 +384,7 @@ class SettingsWrapper(UserSettingsHolder):
def __getattr__(self, name): def __getattr__(self, name):
value = empty value = empty
if name in self._get_supported_settings(): if name in self.all_supported_settings:
with _log_database_error(): with _log_database_error():
value = self._get_local(name) value = self._get_local(name)
if value is not empty: if value is not empty:
@@ -414,7 +416,7 @@ class SettingsWrapper(UserSettingsHolder):
# post_save handler will delete from cache when changed. # post_save handler will delete from cache when changed.
def __setattr__(self, name, value): def __setattr__(self, name, value):
if name in self._get_supported_settings(): if name in self.all_supported_settings:
with _log_database_error(): with _log_database_error():
self._set_local(name, value) self._set_local(name, value)
else: else:
@@ -430,7 +432,7 @@ class SettingsWrapper(UserSettingsHolder):
# pre_delete handler will delete from cache. # pre_delete handler will delete from cache.
def __delattr__(self, name): def __delattr__(self, name):
if name in self._get_supported_settings(): if name in self.all_supported_settings:
with _log_database_error(): with _log_database_error():
self._del_local(name) self._del_local(name)
else: else:
@@ -440,7 +442,7 @@ class SettingsWrapper(UserSettingsHolder):
keys = [] keys = []
with _log_database_error(): with _log_database_error():
for setting in Setting.objects.filter( for setting in Setting.objects.filter(
key__in=self._get_supported_settings(), user__isnull=True): key__in=self.all_supported_settings, user__isnull=True):
# Skip returning settings that have been overridden but are # Skip returning settings that have been overridden but are
# considered to be "not set". # considered to be "not set".
if setting.value is None and SETTING_CACHE_NOTSET == SETTING_CACHE_NONE: if setting.value is None and SETTING_CACHE_NOTSET == SETTING_CACHE_NONE:
@@ -454,7 +456,7 @@ class SettingsWrapper(UserSettingsHolder):
def is_overridden(self, setting): def is_overridden(self, setting):
set_locally = False set_locally = False
if setting in self._get_supported_settings(): if setting in self.all_supported_settings:
with _log_database_error(): with _log_database_error():
set_locally = Setting.objects.filter(key=setting, user__isnull=True).exists() set_locally = Setting.objects.filter(key=setting, user__isnull=True).exists()
set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting) set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting)

5
awx/main/tests/unit/conftest.py
View File

@@ -1,6 +1,9 @@
import pytest import pytest
from mock import PropertyMock
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def _disable_database_settings(mocker): def _disable_database_settings(mocker):
mocker.patch('awx.conf.settings.SettingsWrapper._get_supported_settings', return_value=[]) m = mocker.patch('awx.conf.settings.SettingsWrapper.all_supported_settings', new_callable=PropertyMock)
m.return_value = []