mirrors/synapse
mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2025-03-15 20:20:18 +00:00
Code Activity

Fix timeout function

Browse source 
Turns out deferred.cancel sometimes throws, so we do that last to ensure
that we always do resolve the new deferred.
This commit is contained in:
Erik Johnston 2018-09-15 11:38:39 +01:00
parent c30cfff572
commit 24efb2a70d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/util/async_helpers.py
View file

@ -456,11 +456,12 @@ def timeout_no_seriously(deferred, timeout, reactor):
def time_it_out(): def time_it_out():
timed_out[0] = True timed_out[0] = True
deferred.cancel()
if not new_d.called: if not new_d.called:
new_d.errback(DeferredTimeoutError(timeout, "Deferred")) new_d.errback(DeferredTimeoutError(timeout, "Deferred"))
deferred.cancel()
delayed_call = reactor.callLater(timeout, time_it_out) delayed_call = reactor.callLater(timeout, time_it_out)
def convert_cancelled(value): def convert_cancelled(value):