From b2c04da8dc98ca09620dc207c95f68b2e8a52e62 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 29 Apr 2016 11:43:57 +0100
Subject: Add an email pusher for new users

If they registered with an email address and email notifs are enabled on the HS
---
 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 6ef48d63f7..7fef2fb6f7 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -50,6 +50,7 @@ class PusherPool:
         # recreated, added and started: this means we have only one
         # code path adding pushers.
         pusher.create_pusher(self.hs, {
+            "id": None,
             "user_name": user_id,
             "kind": kind,
             "app_id": app_id,
-- 
cgit 1.4.1


From 92f0f3d21d52ae14a3d4d4536a84055b92d228ae Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 May 2016 11:24:07 +0100
Subject: Catch all exceptions when creating a pusher

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

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

diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 7fef2fb6f7..66eafb69d8 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -186,8 +186,8 @@ class PusherPool:
         for pusherdict in pushers:
             try:
                 p = pusher.create_pusher(self.hs, pusherdict)
-            except PusherConfigException:
-                logger.exception("Couldn't start a pusher: caught PusherConfigException")
+            except:
+                logger.exception("Couldn't start a pusher: caught Exception")
                 continue
             if p:
                 appid_pushkey = "%s:%s" % (
-- 
cgit 1.4.1


From e6bffa4475e1a37643317d709b2003cdf99c149f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 May 2016 11:26:58 +0100
Subject: Unused import

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

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

diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 66eafb69d8..5853ec36a9 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -17,7 +17,6 @@
 from twisted.internet import defer
 
 import pusher
-from synapse.push import PusherConfigException
 from synapse.util.logcontext import preserve_fn
 from synapse.util.async import run_on_reactor
 
-- 
cgit 1.4.1