From 4e6b6ebdb99d53d9677dc3ddefb39c239e6e382b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 May 2015 22:30:38 +0530 Subject: [PATCH] [cache] fix --- frappe/defaults.py | 2 +- frappe/desk/notifications.py | 5 +++-- frappe/utils/redis_wrapper.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/defaults.py b/frappe/defaults.py index bba159ae75..5bdebf089c 100644 --- a/frappe/defaults.py +++ b/frappe/defaults.py @@ -166,7 +166,7 @@ def get_defaults_for(parent="__default"): elif d.defvalue is not None: defaults[d.defkey] = d.defvalue - frappe.cache().hset("default", parent, defaults) + frappe.cache().hset("defaults", parent, defaults) return defaults diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 22c1d55895..9acd2e8b11 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -17,7 +17,9 @@ def get_notifications(): notification_count = {} for name in groups: - notification_count[name] = cache.hget("notification_count:" + name, frappe.session.user) + count = cache.hget("notification_count:" + name, frappe.session.user) + if count is not None: + notification_count[name] = count return { "open_count_doctype": get_notifications_for_doctypes(config, notification_count), @@ -81,7 +83,6 @@ def get_notifications_for_doctypes(config, notification_count): else: open_count_doctype[d] = result - frappe.cache().hset("notification_count:" + d, frappe.session.user, result) return open_count_doctype diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index 5e08f64ea3..bafda659c4 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -109,6 +109,7 @@ class RedisWrapper(redis.Redis): value = super(redis.Redis, self).hget(self.make_key(name), key) if value: value = pickle.loads(value) + frappe.local.cache[name][key] = value elif generator: value = generator() self.hset(name, key, value)