Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4464 from edx/jbau/remove-branch-setting-cache

Browse Source 
removing thread-local cache for branch_setting
This commit is contained in:
Jason Bau
2014-07-17 13:03:08 -04:00
parent e81c33cea5 f12fa05ae1
commit be80e0058e
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/lib/xmodule/xmodule/modulestore/django.py
View File

@@ -136,10 +136,6 @@ class ModuleI18nService(object):
return strftime_localized(*args, **kwargs)
# thread local cache
_THREAD_CACHE = threading.local()
def _get_modulestore_branch_setting():
"""
Returns the branch setting for the module store from the current Django request if configured,
@@ -167,7 +163,6 @@ def _get_modulestore_branch_setting():
branch = getattr(settings, 'MODULESTORE_BRANCH', None)
return branch
# cache the branch setting for this thread so we don't have to recompute it each time
if not hasattr(_THREAD_CACHE, 'branch_setting'):
_THREAD_CACHE.branch_setting = get_branch_setting()
return _THREAD_CACHE.branch_setting
# leaving this in code structured in closure-friendly format b/c we might eventually cache this (again)
# using request_cache
return get_branch_setting()