Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put the warning blob at the top of the file

This commit is contained in:
Richard van der Hoff 2018-10-17 16:56:22 +01:00
parent 1519572961
commit c8f2c19991
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/config/emailconfig.py
View File

@ -26,6 +26,12 @@ from ._base import Config
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
TEMPLATE_DIR_WARNING = """\
WARNING: The email notifier is configured to look for templates in '%(template_dir)s',
but no templates could be found there. We will fall back to using the example templates;
to get rid of this warning, leave 'email.template_dir' unset.
"""
class EmailConfig(Config): class EmailConfig(Config):
def read_config(self, config): def read_config(self, config):
@ -81,12 +87,9 @@ class EmailConfig(Config):
os.path.join(self.email_template_dir, self.email_notif_template_text) os.path.join(self.email_template_dir, self.email_notif_template_text)
) )
): ):
t = """\ t = TEMPLATE_DIR_WARNING % {
WARNING: The email notifier is configured to look for templates in '%s', but no templates "template_dir": self.email_template_dir,
could be found there. We will fall back to using the example templates; to get rid of this }
warning, leave 'email.template_dir' unset.
""" % (self.email_template_dir,)
print(textwrap.fill(t, width=80) + "\n", file=sys.stderr) print(textwrap.fill(t, width=80) + "\n", file=sys.stderr)
self.email_template_dir = None self.email_template_dir = None