Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race in presence handler where we evicted things from cache while handling a key therein

This commit is contained in:
Erik Johnston 2014-09-06 17:38:11 +01:00 committed by Emmanuel ROHEE
parent 7735aad9d6
commit 768ff1a850
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/handlers/presence.py
View File

@ -796,11 +796,12 @@ class PresenceEventSource(object):
updates = [] updates = []
# TODO(paul): use a DeferredList ? How to limit concurrency. # TODO(paul): use a DeferredList ? How to limit concurrency.
for observed_user in cachemap.keys(): for observed_user in cachemap.keys():
if not (from_key < cachemap[observed_user].serial): cached = cachemap[observed_user]
if not (from_key < cached.serial):
continue continue
if (yield self.is_visible(observer_user, observed_user)): if (yield self.is_visible(observer_user, observed_user)):
updates.append((observed_user, cachemap[observed_user])) updates.append((observed_user, cached))
# TODO(paul): limit # TODO(paul): limit