diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-23 16:14:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-23 16:14:01 +0000 |
| commit | e7ab0e0f9f768d7df63b15696ec05942708149e9 (patch) | |
| tree | e02a0484bbd899cc0a9a83ddde894443ffe52d28 | |
| parent | Check presence token interval is less than 100, rather than the token itself (diff) | |
| parent | Create a new stream_id per presence update (diff) | |
| download | synapse-e7ab0e0f9f768d7df63b15696ec05942708149e9.tar.xz | |
Merge pull request #603 from matrix-org/erikj/presence
Create a new stream_id per presence update
| -rw-r--r-- | synapse/storage/presence.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py index 70ece56548..3ef91d34db 100644 --- a/synapse/storage/presence.py +++ b/synapse/storage/presence.py @@ -58,17 +58,20 @@ class UserPresenceState(namedtuple("UserPresenceState", class PresenceStore(SQLBaseStore): @defer.inlineCallbacks def update_presence(self, presence_states): - stream_id_manager = yield self._presence_id_gen.get_next(self) - with stream_id_manager as stream_id: + stream_ordering_manager = yield self._presence_id_gen.get_next_mult( + self, len(presence_states) + ) + + with stream_ordering_manager as stream_orderings: yield self.runInteraction( "update_presence", - self._update_presence_txn, stream_id, presence_states, + self._update_presence_txn, stream_orderings, presence_states, ) - defer.returnValue((stream_id, self._presence_id_gen.get_max_token())) + defer.returnValue((stream_orderings[-1], self._presence_id_gen.get_max_token())) - def _update_presence_txn(self, txn, stream_id, presence_states): - for state in presence_states: + def _update_presence_txn(self, txn, stream_orderings, presence_states): + for stream_id, state in zip(stream_orderings, presence_states): txn.call_after( self.presence_stream_cache.entity_has_changed, state.user_id, stream_id, |