summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-06-06 16:52:27 +0100
committerMark Haines <mjark@negativecurvature.net>2016-06-06 16:52:27 +0100
commitb0932b34cb9c4c8da3b635fd96f980d433a7a236 (patch)
tree5c71050e75a0f007393418b488fd686c51417b99 /synapse/app
parentMerge pull request #844 from matrix-org/markjh/yield_on_sleep (diff)
parentFix a KeyError in the synchrotron presence (diff)
downloadsynapse-b0932b34cb9c4c8da3b635fd96f980d433a7a236.tar.xz
Merge pull request #845 from matrix-org/markjh/synchrotron_presence
Fix a KeyError in the synchrotron presence
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/synchrotron.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index 7273055cc1..5c552ffb29 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -187,7 +187,10 @@ class SynchrotronPresence(object):
                 yield self._send_syncing_users_now()
 
         def _end():
-            if affect_presence:
+            # We check that the user_id is in user_to_num_current_syncs because
+            # user_to_num_current_syncs may have been cleared if we are
+            # shutting down.
+            if affect_presence and user_id in self.user_to_num_current_syncs:
                 self.user_to_num_current_syncs[user_id] -= 1
 
         @contextlib.contextmanager