From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 18 Apr 2020 17:57:00 +0000 (+0200)
Subject: luci-mod-status: index.js: skip includes which failed loading
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0db2abea3ceae24f376af31ffb7ca5e76d19da6;p=oweals%2Fluci.git

luci-mod-status: index.js: skip includes which failed loading

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
index 15dcbe638..da08ec12c 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
@@ -10,7 +10,10 @@ function invokeIncludesLoad(includes) {
 
 	for (var i = 0; i < includes.length; i++) {
 		if (typeof(includes[i].load) == 'function') {
-			tasks.push(includes[i].load());
+			tasks.push(includes[i].load().catch(L.bind(function() {
+				this.failed = true;
+			}, includes[i])));
+
 			has_load = true;
 		}
 		else {
@@ -29,6 +32,9 @@ function startPolling(includes, containers) {
 			for (var i = 0; i < includes.length; i++) {
 				var content = null;
 
+				if (includes[i].failed)
+					continue;
+
 				if (typeof(includes[i].render) == 'function')
 					content = includes[i].render(results ? results[i] : null);
 				else if (includes[i].content != null)