[FIX] Prevent reverse proxy 5xx codes from triggering a page reload

Prior to this fix, the MeshCentral page would automatically reload itself after 10 seconds even if MeshCentral is still down when behind a reverse proxy like NGINX.
This commit is contained in:
TotallyNotElite 2021-01-12 21:39:51 +01:00
parent 06da31eff0
commit 34b46f6346
2 changed files with 6 additions and 2 deletions

View File

@ -1076,7 +1076,9 @@
if (!xdr) xdr = new XMLHttpRequest();
xdr.open('HEAD', window.location.href);
xdr.timeout = 15000;
xdr.onload = function () { reload(); };
// Make sure there isn't a reverse proxy in front that may just be returning 5xx codes
// Status code 4xx should still be allowed, since a page could potentially be removed, etc
xdr.onload = function () { if (xdr.status < 500) reload(); else setTimeout(serverPoll, 10000); };
xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); };
xdr.send();
}

View File

@ -1849,7 +1849,9 @@
if (!xdr) xdr = new XMLHttpRequest();
xdr.open('HEAD', window.location.href);
xdr.timeout = 15000;
xdr.onload = function () { reload(); };
// Make sure there isn't a reverse proxy in front that may just be returning 5xx codes
// Status code 4xx should still be allowed, since a page could potentially be removed, etc
xdr.onload = function () { if (xdr.status < 500) reload(); else setTimeout(serverPoll, 10000); };
xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); };
xdr.send();
}