summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-09-23 15:38:19 +0200
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-23 14:38:19 +0100
commit1c9feadf4bf0755162d0d210bea398a3fb690ab6 (patch)
tree369efc842494a01b5d13d99bff6fe6bf39bdf8b7
parentReturn timeout error to user for identity server calls (#6073) (diff)
downloadsynapse-1c9feadf4bf0755162d0d210bea398a3fb690ab6.tar.xz
Generalize email sending logging (#6075)
In ancient times Synapse would only send emails when it was notifying a user about a message they received...

Now it can do all sorts of neat things!

Change the logging so it's not just about notifications.
-rw-r--r--changelog.d/6075.misc1
-rw-r--r--synapse/push/mailer.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6075.misc b/changelog.d/6075.misc
new file mode 100644
index 0000000000..914e56bcfe
--- /dev/null
+++ b/changelog.d/6075.misc
@@ -0,0 +1 @@
+Change mailer logging to reflect Synapse doesn't just do chat notifications by email now.
\ No newline at end of file
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 5a4fc78b4c..5b16ab4ae8 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -311,7 +311,7 @@ class Mailer(object):
         multipart_msg.attach(text_part)
         multipart_msg.attach(html_part)
 
-        logger.info("Sending email notification to %s" % email_address)
+        logger.info("Sending email to %s" % email_address)
 
         yield make_deferred_yieldable(
             self.sendmail(