Commit 6e6a1d50 by David Ormsbee

Only create loc_cache CACHE entry if it doesn't exist in ENV_TOKENS config.

parent 38a6bf68
...@@ -124,10 +124,11 @@ LOG_DIR = ENV_TOKENS['LOG_DIR'] ...@@ -124,10 +124,11 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
CACHES = ENV_TOKENS['CACHES'] CACHES = ENV_TOKENS['CACHES']
# Cache used for location mapping -- called many times with the same key/value # Cache used for location mapping -- called many times with the same key/value
# in a given request. # in a given request.
CACHES['loc_cache'] = { if 'loc_cache' not in CACHES:
CACHES['loc_cache'] = {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
'LOCATION': 'edx_location_mem_cache', 'LOCATION': 'edx_location_mem_cache',
} }
SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE)
......
...@@ -157,10 +157,11 @@ LOG_DIR = ENV_TOKENS['LOG_DIR'] ...@@ -157,10 +157,11 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
CACHES = ENV_TOKENS['CACHES'] CACHES = ENV_TOKENS['CACHES']
# Cache used for location mapping -- called many times with the same key/value # Cache used for location mapping -- called many times with the same key/value
# in a given request. # in a given request.
CACHES['loc_cache'] = { if 'loc_cache' not in CACHES:
CACHES['loc_cache'] = {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
'LOCATION': 'edx_location_mem_cache', 'LOCATION': 'edx_location_mem_cache',
} }
# Email overrides # Email overrides
DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL) DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment