OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'markjh/external_presence' into markjh/synchrotron

markjh/synchrotron
Mark Haines 2016-06-02 12:52:51 +01:00
parent 40c7c81da9 41cf6a34aa
commit a6ab7305b9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/presence.py
View File

@ -175,7 +175,7 @@ class PresenceHandler(object):
# Stored as a dict from process_id to set of user_id, and a dict of # Stored as a dict from process_id to set of user_id, and a dict of
# process_id to millisecond timestamp last updated. # process_id to millisecond timestamp last updated.
self.external_process_to_current_syncs = {} self.external_process_to_current_syncs = {}
self.external_process_last_updated_ms = [] self.external_process_last_updated_ms = {}
# Start a LoopingCall in 30s that fires every 5s. # Start a LoopingCall in 30s that fires every 5s.
# The initial delay is to allow disconnected clients a chance to # The initial delay is to allow disconnected clients a chance to
@ -422,7 +422,7 @@ class PresenceHandler(object):
# Grab the current presence state for both the users that are syncing # Grab the current presence state for both the users that are syncing
# now and the users that were syncing before this update. # now and the users that were syncing before this update.
prev_states = yield self.current_state_for_users( prev_states = yield self.current_state_for_users(
syncing_user_ids + prev_syncing_user_ids syncing_user_ids | prev_syncing_user_ids
) )
updates = [] updates = []
time_now_ms = self.clock.time_msec() time_now_ms = self.clock.time_msec()

1
synapse/replication/presence_resource.py
View File

@ -37,6 +37,7 @@ class PresenceResource(Resource):
Resource.__init__(self) # Resource is old-style, so no super() Resource.__init__(self) # Resource is old-style, so no super()
self.version_string = hs.version_string self.version_string = hs.version_string
self.clock = hs.get_clock()
self.presence_handler = hs.get_presence_handler() self.presence_handler = hs.get_presence_handler()
def render_POST(self, request): def render_POST(self, request):