Merge pull request #842 from matrix-org/erikj/presence_timer

Fire after 30s not 8h

synapse/handlers/presence.py

@@ -183,7 +183,7 @@ class PresenceHandler(object):
         # The initial delay is to allow disconnected clients a chance to
         # reconnect before we treat them as offline.
         self.clock.call_later(
-            30 * 1000,
+            30,
             self.clock.looping_call,
             self._handle_timeouts,
             5000,
@@ -283,8 +283,10 @@ class PresenceHandler(object):
         """Checks the presence of users that have timed out and updates as
         appropriate.
         """
+        logger.info("Handling presence timeouts")
         now = self.clock.time_msec()
 
+        try:
             with Measure(self.clock, "presence_handle_timeouts"):
                 # Fetch the list of users that *may* have timed out. Things may have
                 # changed since the timeout was set, so we won't necessarily have to
@@ -295,12 +297,12 @@ class PresenceHandler(object):
                 # process have expired.
                 expired_process_ids = [
                     process_id for process_id, last_update
-                in self.external_process_last_update.items()
+                    in self.external_process_last_updated_ms.items()
                     if now - last_update > EXTERNAL_PROCESS_EXPIRY
                 ]
                 for process_id in expired_process_ids:
                     users_to_check.update(
-                    self.external_process_to_current_syncs.pop(process_id, ())
+                        self.external_process_last_updated_ms.pop(process_id, ())
                     )
                     self.external_process_last_update.pop(process_id)
 
@@ -316,11 +318,13 @@ class PresenceHandler(object):
                 changes = handle_timeouts(
                     states,
                     is_mine_fn=self.is_mine_id,
-                syncing_users=self.get_syncing_users(),
+                    syncing_user_ids=self.get_currently_syncing_users(),
                     now=now,
                 )
 
             preserve_fn(self._update_states)(changes)
+        except:
+            logger.exception("Exception in _handle_timeouts loop")
 
     @defer.inlineCallbacks
     def bump_presence_active_time(self, user):