Merge pull request #2025 from imachug/fileneed-timeout

Handle fileNeed timeout
2019-05-20 17:05:23 +02:00 · 2019-05-20 17:05:23 +02:00 · 4e819ac035
commit 4e819ac035
parent dbcaa6bf85 5d920ff7df
1 changed files with 1 additions and 1 deletions
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@ -711,7 +711,7 @@ class UiWebsocket(object):
                with gevent.Timeout(timeout):
                    self.site.needFile(inner_path, priority=6)
            body = self.site.storage.read(inner_path, "rb")
-        except Exception as err:
+        except (Exception, gevent.Timeout) as err:
            self.log.error("%s fileGet error: %s" % (inner_path, Debug.formatException(err)))
            body = None