Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 13:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix emailpusher import

Browse Source 
Try importing at the root level rather than conditionally importing, as per comment
This commit is contained in:
David Baker 2016-05-16 18:40:29 +01:00
parent c39f305067
commit 647781ca56
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/push/pusher.py
View File

@ -18,6 +18,17 @@ from httppusher import HttpPusher
import logging import logging
logger = logging.getLogger(__name__) 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): def create_pusher(hs, pusherdict):
logger.info("trying to create_pusher for %r", 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) logger.info("email enable notifs: %r", hs.config.email_enable_notifs)
if hs.config.email_enable_notifs: if hs.config.email_enable_notifs:
from synapse.push.emailpusher import EmailPusher
PUSHER_TYPES["email"] = EmailPusher PUSHER_TYPES["email"] = EmailPusher
logger.info("defined email pusher type") logger.info("defined email pusher type")