diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-27 10:01:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 10:01:23 +0100 |
| commit | 2fd9831f7cefaf772ef3748466ad93621930bfb2 (patch) | |
| tree | c9397675334ac172f6312b67f76faae9312cea0f /synapse/handlers/sync.py | |
| parent | spell out need for libxml2 for lxml to work (diff) | |
| parent | Update room_list.py (diff) | |
| download | synapse-2fd9831f7cefaf772ef3748466ad93621930bfb2.tar.xz | |
Merge pull request #2574 from matrix-org/erikj/room_list_fixes
Add logging and fix log contexts for publicRooms
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 219529936f..b12988f3c9 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -15,7 +15,7 @@ from synapse.api.constants import Membership, EventTypes from synapse.util.async import concurrently_execute -from synapse.util.logcontext import LoggingContext +from synapse.util.logcontext import LoggingContext, make_deferred_yieldable, preserve_fn from synapse.util.metrics import Measure, measure_func from synapse.util.caches.response_cache import ResponseCache from synapse.push.clientformat import format_push_rules_for_user @@ -184,11 +184,11 @@ class SyncHandler(object): if not result: result = self.response_cache.set( sync_config.request_key, - self._wait_for_sync_for_user( + preserve_fn(self._wait_for_sync_for_user)( sync_config, since_token, timeout, full_state ) ) - return result + return make_deferred_yieldable(result) @defer.inlineCallbacks def _wait_for_sync_for_user(self, sync_config, since_token, timeout, |