diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-25 18:34:46 +0100 |
| commit | ab34fdecb777b057a0ec307328f309bb2bdee05c (patch) | |
| tree | 541dc61435b893897e7a46d8f0a69443e18233d7 /synapse/appservice/scheduler.py | |
| parent | Add some TODOs (diff) | |
| parent | Merge pull request #1041 from matrix-org/paul/third-party-lookup (diff) | |
| download | synapse-ab34fdecb777b057a0ec307328f309bb2bdee05c.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device
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): |