diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-24 13:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 13:52:41 +0100 |
| commit | d89f8683dc873c97fc8e046b2eec200a9be0230c (patch) | |
| tree | 19e005a8ff177a3d0d6ee6eae0ea5c03e775a047 /synapse/appservice | |
| parent | Merge pull request #1040 from matrix-org/erikj/pagination (diff) | |
| parent | Remove tracer (diff) | |
| download | synapse-d89f8683dc873c97fc8e046b2eec200a9be0230c.tar.xz | |
Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts
Preserve some logcontexts
Diffstat (limited to 'synapse/appservice')
| -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): |