Fix gevent.Timeout being not caught

This commit is contained in:
Ivanq 2019-09-02 19:34:29 +00:00 committed by GitHub
parent b9e71c9f6f
commit 5da4537d7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -701,7 +701,7 @@ class UiWebsocket(object):
try:
with gevent.Timeout(timeout):
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, "ok")