diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
| commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
| tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/push | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz | |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/pusher.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py index e6c0806415..de9c33b936 100644 --- a/synapse/push/pusher.py +++ b/synapse/push/pusher.py @@ -18,6 +18,17 @@ from httppusher import HttpPusher import logging logger = logging.getLogger(__name__) +# We try importing this if we can (it will fail if we don't +# have the optional email dependencies installed). We don't +# yet have the config to know if we need the email pusher, +# but importing this after daemonizing seems to fail +# (even though a simple test of importing from a daemonized +# process works fine) +try: + from synapse.push.emailpusher import EmailPusher +except: + pass + def create_pusher(hs, pusherdict): logger.info("trying to create_pusher for %r", pusherdict) @@ -28,7 +39,6 @@ def create_pusher(hs, pusherdict): logger.info("email enable notifs: %r", hs.config.email_enable_notifs) if hs.config.email_enable_notifs: - from synapse.push.emailpusher import EmailPusher PUSHER_TYPES["email"] = EmailPusher logger.info("defined email pusher type") |