summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-03-02 09:43:34 -0500
committerPatrick Cloke <patrickc@matrix.org>2021-03-02 09:43:34 -0500
commitaee10768d8a9bf6c3df80859d2c135607aa1bf80 (patch)
tree3a57573d9add15ea26f5ba16f43072aaebca1f0d /synapse/handlers
parentRe-run rejected metadata background update. (#9503) (diff)
downloadsynapse-aee10768d8a9bf6c3df80859d2c135607aa1bf80.tar.xz
Revert "Fix #8518 (sync requests being cached wrongly on timeout) (#9358)"
This reverts commit f5c93fc9931e4029bbd8000f398b6f39d67a8c46.

This is being backed out due to a regression (#9507) and additional
review feedback being provided.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index ce644e01ad..4e8ed7b33f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -277,9 +277,8 @@ class SyncHandler:
         user_id = sync_config.user.to_string()
         await self.auth.check_auth_blocking(requester=requester)
 
-        res = await self.response_cache.wrap_conditional(
+        res = await self.response_cache.wrap(
             sync_config.request_key,
-            lambda result: since_token != result.next_batch,
             self._wait_for_sync_for_user,
             sync_config,
             since_token,