oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2183 from imachug/patch-2

Browse source 
Fix gevent.Timeout being not caught
This commit is contained in:
ZeroNet 2019-09-02 21:59:44 +02:00 committed by GitHub
commit 166a65e1b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ui/UiWebsocket.py
View file

@ -701,7 +701,7 @@ class UiWebsocket(object):
try: try:
with gevent.Timeout(timeout): with gevent.Timeout(timeout):
self.site.needFile(inner_path, priority=6) self.site.needFile(inner_path, priority=6)
except Exception as err: except (Exception, gevent.Timeout) as err:
return self.response(to, {"error": Debug.formatExceptionMessage(err)}) return self.response(to, {"error": Debug.formatExceptionMessage(err)})
return self.response(to, "ok") return self.response(to, "ok")