diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:54:55 +0100 |
| commit | 2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch) | |
| tree | 8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /synapse/push/pusherpool.py | |
| parent | Write a default log_config when generating config (diff) | |
| parent | Add get_rooms_for_user cache (diff) | |
| download | synapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz | |
Merge branch 'develop' into markjh/config_cleanup
Conflicts: synapse/config/captcha.py
Diffstat (limited to 'synapse/push/pusherpool.py')
| -rw-r--r-- | synapse/push/pusherpool.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index 58fe6ad747..0ab2f65972 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -170,7 +170,11 @@ class PusherPool: def _start_pushers(self, pushers): logger.info("Starting %d pushers", len(pushers)) for pusherdict in pushers: - p = self._create_pusher(pusherdict) + try: + p = self._create_pusher(pusherdict) + except PusherConfigException: + logger.exception("Couldn't start a pusher: caught PusherConfigException") + continue if p: fullid = "%s:%s:%s" % ( pusherdict['app_id'], @@ -182,6 +186,8 @@ class PusherPool: self.pushers[fullid] = p p.start() + logger.info("Started pushers") + @defer.inlineCallbacks def remove_pusher(self, app_id, pushkey, user_name): fullid = "%s:%s:%s" % (app_id, pushkey, user_name) |