From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 May 2019 16:53:21 +0000 (+0100)
Subject: accounts: Unify using DN in cache keys
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c01e5acfea0530a2b5850011688038e60fe84f7;p=ipfire.org.git

accounts: Unify using DN in cache keys

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 74b5ff00..5d9ee556 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -319,7 +319,7 @@ class Account(Object):
 		self.ldap.modify_s(self.dn, modlist)
 
 		# Delete cached attributes
-		self.memcache.delete("accounts:%s:attrs")
+		self.memcache.delete("accounts:%s:attrs" % self.dn)
 
 	def _set(self, key, values):
 		current = self._get(key)
@@ -779,7 +779,7 @@ class Account(Object):
 			return photo
 
 		# Try to retrieve something from the cache
-		avatar = self.memcache.get("accounts:%s:avatar:%s" % (self.uid, size))
+		avatar = self.memcache.get("accounts:%s:avatar:%s" % (self.dn, size))
 		if avatar:
 			return avatar
 
@@ -787,7 +787,7 @@ class Account(Object):
 		avatar = util.generate_thumbnail(photo, size, square=True)
 
 		# Save to cache for 15m
-		self.memcache.set("accounts:%s:avatar:%s" % (self.uid, size), avatar, 900)
+		self.memcache.set("accounts:%s:avatar:%s" % (self.dn, size), avatar, 900)
 
 		return avatar