summary refs log tree commit diff
path: root/synapse/appservice/scheduler.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-23 15:23:39 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 11:58:40 +0100
commit921913935176f5bd3df5e5b960d87c94a2adb304 (patch)
treeccb7c2bddbad96b35fcb0de89b562ed0a4115a67 /synapse/appservice/scheduler.py
parentMerge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff)
downloadsynapse-921913935176f5bd3df5e5b960d87c94a2adb304.tar.xz
Preserve some logcontexts
Diffstat (limited to 'synapse/appservice/scheduler.py')
-rw-r--r--synapse/appservice/scheduler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py

index 6450a12890..68a9de17b8 100644 --- a/synapse/appservice/scheduler.py +++ b/synapse/appservice/scheduler.py
@@ -150,12 +150,12 @@ class _TransactionController(object): if service_is_up: sent = yield txn.send(self.as_api) if sent: - txn.complete(self.store) + yield txn.complete(self.store) else: - self._start_recoverer(service) + preserve_fn(self._start_recoverer)(service) except Exception as e: logger.exception(e) - self._start_recoverer(service) + preserve_fn(self._start_recoverer)(service) @defer.inlineCallbacks def on_recovered(self, recoverer):