OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix logcontext leak in EmailPusher

pull/4204/head
Richard van der Hoff 2018-11-19 17:01:00 +00:00
parent 10cdf519aa
commit f5faf6bc14
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/push/mailer.py
View File

@ -36,6 +36,7 @@ from synapse.push.presentable_names import (
) )
from synapse.types import UserID from synapse.types import UserID
from synapse.util.async_helpers import concurrently_execute from synapse.util.async_helpers import concurrently_execute
from synapse.util.logcontext import make_deferred_yieldable
from synapse.visibility import filter_events_for_client from synapse.visibility import filter_events_for_client
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -192,7 +193,7 @@ class Mailer(object):
logger.info("Sending email push notification to %s" % email_address) 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, self.hs.config.email_smtp_host,
raw_from, raw_to, multipart_msg.as_string().encode('utf8'), raw_from, raw_to, multipart_msg.as_string().encode('utf8'),
reactor=self.hs.get_reactor(), reactor=self.hs.get_reactor(),
@ -201,7 +202,7 @@ class Mailer(object):
username=self.hs.config.email_smtp_user, username=self.hs.config.email_smtp_user,
password=self.hs.config.email_smtp_pass, password=self.hs.config.email_smtp_pass,
requireTransportSecurity=self.hs.config.require_transport_security requireTransportSecurity=self.hs.config.require_transport_security
) ))
@defer.inlineCallbacks @defer.inlineCallbacks
def get_room_vars(self, room_id, user_id, notifs, notif_events, room_state_ids): def get_room_vars(self, room_id, user_id, notifs, notif_events, room_state_ids):