change config to not cache by default, unless overridden by server-specific settings.py

--HG--
branch : cache_separation
This commit is contained in:
David Ormsbee
2012-03-15 15:21:39 -04:00
parent e37eb49065
commit f4625003a7
3 changed files with 9 additions and 4 deletions

View File

@@ -158,10 +158,7 @@ def user_groups(user):
cache_expiration = 60 * 60 # one hour
# Kill caching on dev machines -- we switch groups a lot
if "dev" not in settings.DEFAULT_GROUPS:
group_names = cache.get(fasthash(key))
else:
group_names = None
group_names = cache.get(fasthash(key))
if group_names is None:
group_names = [u.name for u in UserTestGroup.objects.filter(users=user)]

View File

@@ -163,6 +163,13 @@ MAKO_TEMPLATES = {}
LOGGING_ENV = "dev" # override this in different environments
# Default dev cache (i.e. no caching)
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
}
}
# Make sure we execute correctly regardless of where we're called from
execfile(os.path.join(BASE_DIR, "settings.py"))

View File

@@ -6,6 +6,7 @@ Note that 'default' is being preserved for user session caching, which we're
not migrating so as not to inconvenience users by logging them all out.
"""
from django.core import cache
import settings
# If we can't find a 'general' CACHE defined in settings.py, we simply fall back
# to returning the default cache. This will happen with dev machines.