diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-24 14:28:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-24 14:28:57 +0100 |
| commit | 90d5983d7afa89a4431fea053512190ae83c8f3a (patch) | |
| tree | 6c86dd3497030f7e9b629264e210e05a6ea1ce76 /synapse/appservice/scheduler.py | |
| parent | Bump changelog and version (diff) | |
| parent | Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts (diff) | |
| download | synapse-90d5983d7afa89a4431fea053512190ae83c8f3a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1
Diffstat (limited to 'synapse/appservice/scheduler.py')
| -rw-r--r-- | synapse/appservice/scheduler.py | 6 |
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): |