summary refs log tree commit diff
path: root/synapse/storage/presence.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-01 14:54:29 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-01 14:54:29 +0000
commitd50ca1b1edf45b630715f1847435eb493842bbdc (patch)
tree5a291e62c4615275e7fc63284b088d82f069c3a9 /synapse/storage/presence.py
parentMerge pull request #611 from matrix-org/erikj/expiring_cache_size (diff)
parentLoad the current id in the IdGenerator constructor (diff)
downloadsynapse-d50ca1b1edf45b630715f1847435eb493842bbdc.tar.xz
Merge pull request #613 from matrix-org/markjh/yield
Load the current id in the IdGenerator constructor
Diffstat (limited to 'synapse/storage/presence.py')
-rw-r--r--synapse/storage/presence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py

index 3ef91d34db..eece7f8961 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py
@@ -58,8 +58,8 @@ class UserPresenceState(namedtuple("UserPresenceState", class PresenceStore(SQLBaseStore): @defer.inlineCallbacks def update_presence(self, presence_states): - stream_ordering_manager = yield self._presence_id_gen.get_next_mult( - self, len(presence_states) + stream_ordering_manager = self._presence_id_gen.get_next_mult( + len(presence_states) ) with stream_ordering_manager as stream_orderings: