diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
commit | 09e4bc05016a37f70111c4e54df10c9f070e8ba4 (patch) | |
tree | e5cc39f79c3d855716c859c3e71969ae704a2054 /synapse/push/pusher.py | |
parent | Remove spurious log lines (diff) | |
parent | Increase size of IP cache (diff) | |
download | synapse-09e4bc05016a37f70111c4e54df10c9f070e8ba4.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup
Diffstat (limited to 'synapse/push/pusher.py')
-rw-r--r-- | synapse/push/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py index 9385c80ce3..491f27bded 100644 --- a/synapse/push/pusher.py +++ b/synapse/push/pusher.py @@ -57,8 +57,8 @@ class PusherFactory(object): 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 + def _create_email_pusher(self, _hs, pusherdict): + app_name = self._app_name_from_pusherdict(pusherdict) mailer = self.mailers.get(app_name) if not mailer: mailer = Mailer( |