From 4ffde716974c211722342cf841fd10c72c3032b0 Mon Sep 17 00:00:00 2001 From: slav0nic Date: Thu, 26 Apr 2012 14:27:49 +0300 Subject: [PATCH] make cache keys unique with djangobb_ prefix --- djangobb_forum/middleware.py | 10 +++++----- djangobb_forum/templatetags/forum_extras.py | 2 +- djangobb_forum/views.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/djangobb_forum/middleware.py b/djangobb_forum/middleware.py index c2854ae..9ab46e6 100644 --- a/djangobb_forum/middleware.py +++ b/djangobb_forum/middleware.py @@ -9,7 +9,7 @@ from djangobb_forum import settings as forum_settings class LastLoginMiddleware(object): def process_request(self, request): if request.user.is_authenticated(): - cache.set(str(request.user.id), True, forum_settings.USER_ONLINE_TIMEOUT) + cache.set('djangobb_user%d' % request.user.id, True, forum_settings.USER_ONLINE_TIMEOUT) class ForumMiddleware(object): def process_request(self, request): @@ -30,8 +30,8 @@ class UsersOnline(object): def process_request(self, request): now = datetime.now() delta = now - timedelta(minutes=forum_settings.USER_ONLINE_TIMEOUT) - users_online = cache.get('users_online', {}) - guests_online = cache.get('guests_online', {}) + users_online = cache.get('djangobb_users_online', {}) + guests_online = cache.get('djangobb_guests_online', {}) if request.user.is_authenticated(): users_online[request.user.id] = now @@ -47,5 +47,5 @@ class UsersOnline(object): if guests_online[guest_id] < delta: del guests_online[guest_id] - cache.set('users_online', users_online, 60*60*24) - cache.set('guests_online', guests_online, 60*60*24) + cache.set('djangobb_users_online', users_online, 60*60*24) + cache.set('djangobb_guests_online', guests_online, 60*60*24) diff --git a/djangobb_forum/templatetags/forum_extras.py b/djangobb_forum/templatetags/forum_extras.py index bb4575d..767def7 100644 --- a/djangobb_forum/templatetags/forum_extras.py +++ b/djangobb_forum/templatetags/forum_extras.py @@ -228,7 +228,7 @@ def forum_authority(user): @register.filter def online(user): - return cache.get(str(user.id)) + return cache.get('djangobb_user%d' % user.id) @register.filter def attachment_link(attach): diff --git a/djangobb_forum/views.py b/djangobb_forum/views.py index 3b79d76..fb1f45a 100644 --- a/djangobb_forum/views.py +++ b/djangobb_forum/views.py @@ -29,9 +29,9 @@ from haystack.query import SearchQuerySet, SQ def index(request, full=True): - users_cached = cache.get('users_online', {}) + users_cached = cache.get('djangobb_users_online', {}) users_online = users_cached and User.objects.filter(id__in = users_cached.keys()) or [] - guests_cached = cache.get('guests_online', {}) + guests_cached = cache.get('djangobb_guests_online', {}) guest_count = len(guests_cached) users_count = len(users_online)