diff options
author | Erik Johnston <erik@matrix.org> | 2018-09-15 11:38:39 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-09-15 11:38:39 +0100 |
commit | 24efb2a70dfd8aa100507612836601991e11affc (patch) | |
tree | 82cfeb094e629a818d2c66ff35d3e5ba514ec5bc /synapse/util/file_consumer.py | |
parent | Merge pull request #3875 from matrix-org/erikj/extra_timeouts (diff) | |
download | synapse-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/util/file_consumer.py')
0 files changed, 0 insertions, 0 deletions