diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 14:18:00 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 14:18:00 +0100 |
| commit | 61463323871ccbe17f8933c1695d7901cd6a8a20 (patch) | |
| tree | d70648dd1b7466452da27a4b7d8993c58481ed03 /synapse/appservice/scheduler.py | |
| parent | Merge branch 'develop' into rav/deferred_timeout (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-61463323871ccbe17f8933c1695d7901cd6a8a20.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout
Diffstat (limited to '')
| -rw-r--r-- | synapse/appservice/scheduler.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py index 6da315473d..dfc8d1b42e 100644 --- a/synapse/appservice/scheduler.py +++ b/synapse/appservice/scheduler.py @@ -176,17 +176,20 @@ class _TransactionController(object): @defer.inlineCallbacks def _start_recoverer(self, service): - yield self.store.set_appservice_state( - service, - ApplicationServiceState.DOWN - ) - logger.info( - "Application service falling behind. Starting recoverer. AS ID %s", - service.id - ) - recoverer = self.recoverer_fn(service, self.on_recovered) - self.add_recoverers([recoverer]) - recoverer.recover() + try: + yield self.store.set_appservice_state( + service, + ApplicationServiceState.DOWN + ) + logger.info( + "Application service falling behind. Starting recoverer. AS ID %s", + service.id + ) + recoverer = self.recoverer_fn(service, self.on_recovered) + self.add_recoverers([recoverer]) + recoverer.recover() + except Exception: + logger.exception("Error starting AS recoverer") @defer.inlineCallbacks def _is_service_up(self, service): |