diff options
| author | David Baker <dave@matrix.org> | 2016-05-04 14:52:10 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-04 14:52:10 +0100 |
| commit | 9ef05a12c380a6a5a45226d6086d70512fd4f073 (patch) | |
| tree | e7a0b462714f6f9eb078b2f858075d8ffebff35c | |
| parent | Correct SQL statement for postgres (diff) | |
| download | synapse-9ef05a12c380a6a5a45226d6086d70512fd4f073.tar.xz | |
Add date header & message id
| -rw-r--r-- | synapse/app/pusher.py | 3 | ||||
| -rw-r--r-- | synapse/push/mailer.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 9976908983..89c8d5c7ce 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -20,6 +20,7 @@ from synapse.server import HomeServer from synapse.config._base import ConfigError from synapse.config.database import DatabaseConfig from synapse.config.logger import LoggingConfig +from synapse.config.emailconfig import EmailConfig from synapse.http.site import SynapseSite from synapse.metrics.resource import MetricsResource, METRICS_PREFIX from synapse.replication.slave.storage.events import SlavedEventStore @@ -91,7 +92,7 @@ class SlaveConfig(DatabaseConfig): """ % locals() -class PusherSlaveConfig(SlaveConfig, LoggingConfig): +class PusherSlaveConfig(SlaveConfig, LoggingConfig, EmailConfig): pass diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 1e6654e2bb..037bc990d0 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -152,6 +152,8 @@ class Mailer(object): multipart_msg['Subject'] = "New Matrix Notifications" multipart_msg['From'] = self.hs.config.email_notif_from multipart_msg['To'] = email_address + multipart_msg['Date'] = email.utils.formatdate() + multipart_msg['Message-ID'] = email.utils.make_msgid() multipart_msg.attach(text_part) multipart_msg.attach(html_part) |