ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3403 from ostcar/optional_restricted_data_cache

Browse Source 
Make RestrictedDataCache optional
This commit is contained in:
Emanuel Schütze 2017-09-15 10:56:22 +02:00 committed by GitHub
commit 83f67b23c9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/utils/cache.py
View File

@ -15,6 +15,7 @@ from typing import ( # noqa
from channels import Group from channels import Group
from channels.sessions import session_for_reply_channel from channels.sessions import session_for_reply_channel
from django.conf import settings
from django.core.cache import cache, caches from django.core.cache import cache, caches
if TYPE_CHECKING: if TYPE_CHECKING:
@ -296,7 +297,10 @@ def get_redis_connection() -> Any:
if use_redis_cache(): if use_redis_cache():
websocket_user_cache = RedisWebsocketUserCache() # type: BaseWebsocketUserCache websocket_user_cache = RedisWebsocketUserCache() # type: BaseWebsocketUserCache
restricted_data_cache = RestrictedDataCache() # type: Union[RestrictedDataCache, DummyRestrictedDataCache] if settings.DISABLE_USER_CACHE:
restricted_data_cache = DummyRestrictedDataCache() # type: Union[RestrictedDataCache, DummyRestrictedDataCache]
else:
restricted_data_cache = RestrictedDataCache()
else: else:
websocket_user_cache = DjangoCacheWebsocketUserCache() websocket_user_cache = DjangoCacheWebsocketUserCache()
restricted_data_cache = DummyRestrictedDataCache() restricted_data_cache = DummyRestrictedDataCache()

5
openslides/utils/settings.py.tpl
View File

@ -112,6 +112,11 @@ if use_redis:
SESSION_ENGINE = 'redis_sessions.session' SESSION_ENGINE = 'redis_sessions.session'
# When use_redis is True, the restricted data cache caches the data individuel
# for each user. This requires a lot of memory if there are a lot of active
# users. If use_redis is False, this setting has no effect.
DISABLE_USER_CACHE = False
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/ # https://docs.djangoproject.com/en/1.10/topics/i18n/