Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-05-04 15:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect logcontexts after a Deferred was cancelled (#4407)

Browse source
This commit is contained in:
Richard van der Hoff 2019-01-17 14:00:23 +00:00 • committed by GitHub
parent 9feb5d0b71
commit 676cf2ee26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 117 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/util/async_helpers.py
View file

@ -387,12 +387,14 @@ def timeout_deferred(deferred, timeout, reactor, on_timeout_cancel=None):
deferred that wraps and times out the given deferred, correctly handling
the case where the given deferred's canceller throws.
(See https://twistedmatrix.com/trac/ticket/9534)
NOTE: Unlike `Deferred.addTimeout`, this function returns a new deferred
Args:
deferred (Deferred)
timeout (float): Timeout in seconds
reactor (twisted.internet.reactor): The twisted reactor to use
reactor (twisted.interfaces.IReactorTime): The twisted reactor to use
on_timeout_cancel (callable): A callable which is called immediately
after the deferred times out, and not if this deferred is
otherwise cancelled before the timeout.