Merge pull request #2183 from imachug/patch-2

Fix gevent.Timeout being not caught
2019-09-02 21:59:44 +02:00 · 2019-09-02 21:59:44 +02:00 · 166a65e1b1
commit 166a65e1b1
parent b9e71c9f6f 5da4537d7c
1 changed files with 1 additions and 1 deletions
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@ -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")