summary refs log tree commit diff
path: root/synapse/storage/presence.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-01 14:32:56 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-01 14:32:56 +0000
commit54172924c834a954fcbbc6224318140b9e95aa7d (patch)
treeff950648c290b028b1993f1c627eaf764744df2a /synapse/storage/presence.py
parentMerge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff)
downloadsynapse-54172924c834a954fcbbc6224318140b9e95aa7d.tar.xz
Load the current id in the IdGenerator constructor
Rather than loading them lazily. This allows us to remove all
the yield statements and spurious arguments for the get_next
methods.

It also allows us to replace all instances of get_next_txn with
get_next since get_next no longer needs to access the db.
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: