diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 01:02:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 01:02:25 +0100 |
| commit | db75c86e8463b130d4dcd84e79c1ebee616f9689 (patch) | |
| tree | b7c0c3e9262f8ca27470a0151cb5109472da20fa /synapse/appservice/scheduler.py | |
| parent | Move more xrange to six (diff) | |
| parent | Merge pull request #3085 from NotAFile/py3-config-text-mode (diff) | |
| download | synapse-db75c86e8463b130d4dcd84e79c1ebee616f9689.tar.xz | |
Merge branch 'develop' into py3-xrange-1
Diffstat (limited to 'synapse/appservice/scheduler.py')
| -rw-r--r-- | synapse/appservice/scheduler.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py index dfc8d1b42e..6eddbc0828 100644 --- a/synapse/appservice/scheduler.py +++ b/synapse/appservice/scheduler.py @@ -51,7 +51,7 @@ components. from twisted.internet import defer from synapse.appservice import ApplicationServiceState -from synapse.util.logcontext import preserve_fn +from synapse.util.logcontext import run_in_background from synapse.util.metrics import Measure import logging @@ -106,7 +106,7 @@ class _ServiceQueuer(object): def enqueue(self, service, event): # if this service isn't being sent something self.queued_events.setdefault(service.id, []).append(event) - preserve_fn(self._send_request)(service) + run_in_background(self._send_request, service) @defer.inlineCallbacks def _send_request(self, service): @@ -152,10 +152,10 @@ class _TransactionController(object): if sent: yield txn.complete(self.store) else: - preserve_fn(self._start_recoverer)(service) - except Exception as e: - logger.exception(e) - preserve_fn(self._start_recoverer)(service) + run_in_background(self._start_recoverer, service) + except Exception: + logger.exception("Error creating appservice transaction") + run_in_background(self._start_recoverer, service) @defer.inlineCallbacks def on_recovered(self, recoverer): |