diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-09 20:02:30 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-09 20:02:30 +0100 |
| commit | 1a46daf621097d509207a29f6c2cb1152e494340 (patch) | |
| tree | 9290dee5ebd1705369a89f4ba2216bd7f1b6c51c | |
| parent | Set the user as online if they start polling the v2 sync (diff) | |
| parent | Fix some races in the synapse presence handler caused by not yielding on defe... (diff) | |
| download | synapse-1a46daf621097d509207a29f6c2cb1152e494340.tar.xz | |
Merge branch 'markjh/presence_races' into markjh/v2_sync_api
| -rw-r--r-- | synapse/handlers/presence.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index e91e81831e..ce60642127 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -378,7 +378,7 @@ class PresenceHandler(BaseHandler): # TODO(paul): perform a presence push as part of start/stop poll so # we don't have to do this all the time - self.changed_presencelike_data(target_user, state) + yield self.changed_presencelike_data(target_user, state) def bump_presence_active_time(self, user, now=None): if now is None: @@ -422,12 +422,12 @@ class PresenceHandler(BaseHandler): @log_function def started_user_eventstream(self, user): # TODO(paul): Use "last online" state - self.set_state(user, user, {"presence": PresenceState.ONLINE}) + return self.set_state(user, user, {"presence": PresenceState.ONLINE}) @log_function def stopped_user_eventstream(self, user): # TODO(paul): Save current state as "last online" state - self.set_state(user, user, {"presence": PresenceState.OFFLINE}) + return self.set_state(user, user, {"presence": PresenceState.OFFLINE}) @defer.inlineCallbacks def user_joined_room(self, user, room_id): @@ -1263,6 +1263,11 @@ class UserPresenceCache(object): self.state = {"presence": PresenceState.OFFLINE} self.serial = None + def __repr__(self): + return "UserPresenceCache(state=%r, serial=%r)" % ( + self.state, self.serial + ) + def update(self, state, serial): assert("mtime_age" not in state) |