diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-27 11:47:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 11:47:49 +0100 |
| commit | 9c3da2456183172677c27fbe6e0243af1a2c68a6 (patch) | |
| tree | f022f1fc5930a11c0d9058544dc480cfbb7fdf9f /synapse/push | |
| parent | Merge pull request #3139 from matrix-org/rav/consume_errors (diff) | |
| parent | Improve exception handling for background processes (diff) | |
| download | synapse-9c3da2456183172677c27fbe6e0243af1a2c68a6.tar.xz | |
Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions
Improve exception handling for background processes
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/emailpusher.py | 11 | ||||
| -rw-r--r-- | synapse/push/httppusher.py | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index 58df98a793..ba7286cb72 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -77,10 +77,13 @@ class EmailPusher(object): @defer.inlineCallbacks def on_started(self): if self.mailer is not None: - self.throttle_params = yield self.store.get_throttle_params_by_room( - self.pusher_id - ) - yield self._process() + try: + self.throttle_params = yield self.store.get_throttle_params_by_room( + self.pusher_id + ) + yield self._process() + except Exception: + logger.exception("Error starting email pusher") def on_stop(self): if self.timed_call: diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 2cbac571b8..1420d378ef 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -94,7 +94,10 @@ class HttpPusher(object): @defer.inlineCallbacks def on_started(self): - yield self._process() + try: + yield self._process() + except Exception: + logger.exception("Error starting http pusher") @defer.inlineCallbacks def on_new_notifications(self, min_stream_ordering, max_stream_ordering): |