Attempt to fix bug where we 500d an event stream due to trying to can…

…cel a timer twice
Erethon · Nov 26, 2014 · 00ab5cd · 00ab5cd
1 parent 858e87a
commit 00ab5cd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
@@ -53,8 +53,12 @@ def get_stream(self, auth_user_id, pagin_config, timeout=0):
             if auth_user not in self._streams_per_user:
                 self._streams_per_user[auth_user] = 0
                 if auth_user in self._stop_timer_per_user:
-                    self.clock.cancel_call_later(
-                        self._stop_timer_per_user.pop(auth_user))
+                    try:
+                        self.clock.cancel_call_later(
+                            self._stop_timer_per_user.pop(auth_user)
+                        )
+                    except:
+                        logger.exception("Failed to cancel event timer")
                 else:
                     yield self.distributor.fire(
                         "started_user_eventstream", auth_user
@@ -95,10 +99,12 @@ def _later():
                     logger.debug(
                         "_later stopped_user_eventstream %s", auth_user
                     )
+
+                    self._stop_timer_per_user.pop(auth_user, None)
+
                     yield self.distributor.fire(
                         "stopped_user_eventstream", auth_user
                     )
-                    del self._stop_timer_per_user[auth_user]
 
                 logger.debug("Scheduling _later: for %s", auth_user)
                 self._stop_timer_per_user[auth_user] = (