From 11c2a3655f14550193adb0360e5df62cc7274b9a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 22 May 2017 17:48:53 +0100
Subject: Only load jinja2 templates once

Instead of every time a new email pusher is created, as loading jinja2
templates is slow.
---
 synapse/push/pusher.py | 56 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 12 deletions(-)

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

diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py
index de9c33b936..9385c80ce3 100644
--- a/synapse/push/pusher.py
+++ b/synapse/push/pusher.py
@@ -26,22 +26,54 @@ logger = logging.getLogger(__name__)
 # process works fine)
 try:
     from synapse.push.emailpusher import EmailPusher
+    from synapse.push.mailer import Mailer, load_jinja2_templates
 except:
     pass
 
 
-def create_pusher(hs, pusherdict):
-    logger.info("trying to create_pusher for %r", pusherdict)
+class PusherFactory(object):
+    def __init__(self, hs):
+        self.hs = hs
 
-    PUSHER_TYPES = {
-        "http": HttpPusher,
-    }
+        self.pusher_types = {
+            "http": HttpPusher,
+        }
 
-    logger.info("email enable notifs: %r", hs.config.email_enable_notifs)
-    if hs.config.email_enable_notifs:
-        PUSHER_TYPES["email"] = EmailPusher
-        logger.info("defined email pusher type")
+        logger.info("email enable notifs: %r", hs.config.email_enable_notifs)
+        if hs.config.email_enable_notifs:
+            self.mailers = {}  # app_name -> Mailer
 
-    if pusherdict['kind'] in PUSHER_TYPES:
-        logger.info("found pusher")
-        return PUSHER_TYPES[pusherdict['kind']](hs, pusherdict)
+            templates = load_jinja2_templates(hs.config)
+            self.notif_template_html, self.notif_template_text = templates
+
+            self.pusher_types["email"] = self._create_email_pusher
+
+            logger.info("defined email pusher type")
+
+    def create_pusher(self, pusherdict):
+        logger.info("trying to create_pusher for %r", pusherdict)
+
+        if pusherdict['kind'] in self.pusher_types:
+            logger.info("found pusher")
+            return self.pusher_types[pusherdict['kind']](self.hs, pusherdict)
+
+    def _create_email_pusher(self, pusherdict):
+        app_name = self._brand_from_pusherdict
+        mailer = self.mailers.get(app_name)
+        if not mailer:
+            mailer = Mailer(
+                hs=self.hs,
+                app_name=app_name,
+                notif_template_html=self.notif_template_html,
+                notif_template_text=self.notif_template_text,
+            )
+            self.mailers[app_name] = mailer
+        return EmailPusher(self.hs, pusherdict, mailer)
+
+    def _app_name_from_pusherdict(self, pusherdict):
+        if 'data' in pusherdict and 'brand' in pusherdict['data']:
+            app_name = pusherdict['data']['brand']
+        else:
+            app_name = self.hs.config.email_app_name
+
+        return app_name
-- 
cgit 1.5.1


From 66b121b2fcc159065eb59dd577f8cadb74da7a9e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 6 Jun 2017 11:46:38 +0100
Subject: Fix wrong number of arguments

---
 synapse/push/pusher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py
index 9385c80ce3..f2c8eb870f 100644
--- a/synapse/push/pusher.py
+++ b/synapse/push/pusher.py
@@ -57,7 +57,7 @@ class PusherFactory(object):
             logger.info("found pusher")
             return self.pusher_types[pusherdict['kind']](self.hs, pusherdict)
 
-    def _create_email_pusher(self, pusherdict):
+    def _create_email_pusher(self, _hs, pusherdict):
         app_name = self._brand_from_pusherdict
         mailer = self.mailers.get(app_name)
         if not mailer:
-- 
cgit 1.5.1


From cca94272fa9dc47f23585e3a33484384734c62bc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 6 Jun 2017 11:50:07 +0100
Subject: Fix typo when getting app name

---
 synapse/push/pusher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py
index f2c8eb870f..491f27bded 100644
--- a/synapse/push/pusher.py
+++ b/synapse/push/pusher.py
@@ -58,7 +58,7 @@ class PusherFactory(object):
             return self.pusher_types[pusherdict['kind']](self.hs, pusherdict)
 
     def _create_email_pusher(self, _hs, pusherdict):
-        app_name = self._brand_from_pusherdict
+        app_name = self._app_name_from_pusherdict(pusherdict)
         mailer = self.mailers.get(app_name)
         if not mailer:
             mailer = Mailer(
-- 
cgit 1.5.1