summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-09 15:43:18 +0000
committerErik Johnston <erik@matrix.org>2016-12-09 15:43:18 +0000
commitbe14c24cea7d96f850180759870e83c3789bcdda (patch)
tree69af80fd2504959b1dcf811279adff26b2f77737 /synapse/handlers
parentMerge pull request #1680 from matrix-org/erikj/joined_rooms (diff)
downloadsynapse-be14c24cea7d96f850180759870e83c3789bcdda.tar.xz
Fix rare notifier bug where listeners dont timeout
There was a race condition that caused the notifier to 'miss' the
timeout notification, since there were no other checks for the timeout
this caused listeners to get stuck in a loop until something happened.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index a86996689c..b62773dcbe 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -510,6 +510,7 @@ class SyncHandler(object): Returns: Deferred(SyncResult) """ + logger.info("Calculating sync response for %r", sync_config.user) # NB: The now_token gets changed by some of the generate_sync_* methods, # this is due to some of the underlying streams not supporting the ability