summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-15 11:38:39 +0100
committerErik Johnston <erik@matrix.org>2018-09-15 11:38:39 +0100
commit24efb2a70dfd8aa100507612836601991e11affc (patch)
tree82cfeb094e629a818d2c66ff35d3e5ba514ec5bc /synapse/streams
parentMerge pull request #3875 from matrix-org/erikj/extra_timeouts (diff)
downloadsynapse-24efb2a70dfd8aa100507612836601991e11affc.tar.xz
Fix timeout function
Turns out deferred.cancel sometimes throws, so we do that last to ensure
that we always do resolve the new deferred.
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions