diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-22 15:29:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 15:29:16 +0000 |
| commit | d14e94bae49e3d2ec2ba5ea1ebd36e6b39b7dcc1 (patch) | |
| tree | 2155320ecca321530b1ecd9793f31e355cf0211c /synapse/push/pusherpool.py | |
| parent | Merge pull request #4715 from matrix-org/erikj/fix_state_invalidation (diff) | |
| parent | Add missing return (diff) | |
| download | synapse-d14e94bae49e3d2ec2ba5ea1ebd36e6b39b7dcc1.tar.xz | |
Merge pull request #4716 from matrix-org/erikj/pusher_logging
Fix up pusher logging a bit
Diffstat (limited to 'synapse/push/pusherpool.py')
| -rw-r--r-- | synapse/push/pusherpool.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index b2c92ce683..abf1a1a9c1 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -19,6 +19,7 @@ import logging from twisted.internet import defer from synapse.metrics.background_process_metrics import run_as_background_process +from synapse.push import PusherConfigException from synapse.push.pusher import PusherFactory logger = logging.getLogger(__name__) @@ -222,6 +223,15 @@ class PusherPool: """ try: p = self.pusher_factory.create_pusher(pusherdict) + except PusherConfigException as e: + logger.warning( + "Pusher incorrectly configured user=%s, appid=%s, pushkey=%s: %s", + pusherdict.get('user_name'), + pusherdict.get('app_id'), + pusherdict.get('pushkey'), + e, + ) + return except Exception: logger.exception("Couldn't start a pusher: caught Exception") return |