From 0abb094f1ada9c4a78a11eb06b205c00db826860 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 21 Feb 2019 17:51:21 +0000
Subject: bail out early in on_new_receipts if no pushers (#4706)

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

(limited to 'synapse/push/pusherpool.py')

diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 5a4e73ccd6..b2c92ce683 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -140,6 +140,10 @@ class PusherPool:
 
     @defer.inlineCallbacks
     def on_new_notifications(self, min_stream_id, max_stream_id):
+        if not self.pushers:
+            # nothing to do here.
+            return
+
         try:
             users_affected = yield self.store.get_push_action_users_in_range(
                 min_stream_id, max_stream_id
@@ -155,6 +159,10 @@ class PusherPool:
 
     @defer.inlineCallbacks
     def on_new_receipts(self, min_stream_id, max_stream_id, affected_room_ids):
+        if not self.pushers:
+            # nothing to do here.
+            return
+
         try:
             # Need to subtract 1 from the minimum because the lower bound here
             # is not inclusive
-- 
cgit 1.4.1


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: Correctly handle PusherConfigException

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

(limited to 'synapse/push/pusherpool.py')

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
-- 
cgit 1.4.1


From b82c9cf4629040681c7d06846422705734acd110 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 22 Feb 2019 15:27:40 +0000
Subject: Add missing return

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

(limited to 'synapse/push/pusherpool.py')

diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index af82e02b46..abf1a1a9c1 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -231,6 +231,7 @@ class PusherPool:
                 pusherdict.get('pushkey'),
                 e,
             )
+            return
         except Exception:
             logger.exception("Couldn't start a pusher: caught Exception")
             return
-- 
cgit 1.4.1