summary refs log tree commit diff
path: root/synapse/push/emailpusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
commit4c22c9b0b6d857512c66ec6fdc03e383b8c47af3 (patch)
treeeb406b0cf027fcc7f9db1d67c9999f65ac8b6140 /synapse/push/emailpusher.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3441 from matrix-org/erikj/redo_erasure (diff)
downloadsynapse-4c22c9b0b6d857512c66ec6fdc03e383b8c47af3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/emailpusher.py')
-rw-r--r--synapse/push/emailpusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py

index ba7286cb72..52d4f087ee 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.internet import defer, reactor +from twisted.internet import defer from twisted.internet.error import AlreadyCalled, AlreadyCancelled import logging @@ -199,7 +199,7 @@ class EmailPusher(object): self.timed_call = None if soonest_due_at is not None: - self.timed_call = reactor.callLater( + self.timed_call = self.hs.get_reactor().callLater( self.seconds_until(soonest_due_at), self.on_timer )