From f2891d248756c968c346df052c796c0c69d6e764 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 22 Feb 2019 15:18:19 +0000
Subject: [PATCH] Correctly handle PusherConfigException

---
 synapse/push/pusherpool.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index b2c92ce683..af82e02b46 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,14 @@ 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,
+            )
         except Exception:
             logger.exception("Couldn't start a pusher: caught Exception")
             return