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

Merge pull request #603 from matrix-org/erikj/presence 

Create a new stream_id per presence update
This commit is contained in:
Erik Johnston 2016-02-23 16:14:01 +00:00
parent b5f77eb12a 6451fcd085
commit e7ab0e0f9f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/storage/presence.py
View File

@ -58,17 +58,20 @@ class UserPresenceState(namedtuple("UserPresenceState",
class PresenceStore(SQLBaseStore): class PresenceStore(SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def update_presence(self, presence_states): def update_presence(self, presence_states):
stream_id_manager = yield self._presence_id_gen.get_next(self) stream_ordering_manager = yield self._presence_id_gen.get_next_mult(
with stream_id_manager as stream_id: self, len(presence_states)
)
with stream_ordering_manager as stream_orderings:
yield self.runInteraction( yield self.runInteraction(
"update_presence", "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): def _update_presence_txn(self, txn, stream_orderings, presence_states):
for state in presence_states: for stream_id, state in zip(stream_orderings, presence_states):
txn.call_after( txn.call_after(
self.presence_stream_cache.entity_has_changed, self.presence_stream_cache.entity_has_changed,
state.user_id, stream_id, state.user_id, stream_id,