diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-11-19 17:01:00 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-11-19 17:07:01 +0000 |
commit | f5faf6bc14bad63d85d4f9a28a1db8ee777cd193 (patch) | |
tree | 3debc469506366e688371b270a5377fe660c53c9 /synapse/push | |
parent | Merge pull request #4182 from aaronraimist/update-issue-template (diff) | |
download | synapse-f5faf6bc14bad63d85d4f9a28a1db8ee777cd193.tar.xz |
Fix logcontext leak in EmailPusher
Diffstat (limited to 'synapse/push')
-rw-r--r-- | synapse/push/mailer.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index ebcb93bfc7..1eb5be0957 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -36,6 +36,7 @@ from synapse.push.presentable_names import ( ) from synapse.types import UserID from synapse.util.async_helpers import concurrently_execute +from synapse.util.logcontext import make_deferred_yieldable from synapse.visibility import filter_events_for_client logger = logging.getLogger(__name__) @@ -192,7 +193,7 @@ class Mailer(object): logger.info("Sending email push notification to %s" % email_address) - yield self.sendmail( + yield make_deferred_yieldable(self.sendmail( self.hs.config.email_smtp_host, raw_from, raw_to, multipart_msg.as_string().encode('utf8'), reactor=self.hs.get_reactor(), @@ -201,7 +202,7 @@ class Mailer(object): username=self.hs.config.email_smtp_user, password=self.hs.config.email_smtp_pass, requireTransportSecurity=self.hs.config.require_transport_security - ) + )) @defer.inlineCallbacks def get_room_vars(self, room_id, user_id, notifs, notif_events, room_state_ids): |