diff --git a/scripts/system/places/places.html b/scripts/system/places/places.html index 83def56ed9..040eaa422e 100644 --- a/scripts/system/places/places.html +++ b/scripts/system/places/places.html @@ -215,11 +215,16 @@ regionStyle = " style='background-color: #004d57;'"; } + var serverInError = ""; + if (metaverseList[m].error) { + serverInError = "💀 "; + } + formattedMetaverseList = formattedMetaverseList + "
"; formattedMetaverseList = formattedMetaverseList + ""; formattedMetaverseList = formattedMetaverseList + " "; formattedMetaverseList = formattedMetaverseList + " "; - formattedMetaverseList = formattedMetaverseList + " "; + formattedMetaverseList = formattedMetaverseList + " "; if (!metaverseList[m].pinned) { formattedMetaverseList = formattedMetaverseList + " "; } else { diff --git a/scripts/system/places/places.js b/scripts/system/places/places.js index f7c851eeca..9ec09ecec3 100644 --- a/scripts/system/places/places.js +++ b/scripts/system/places/places.js @@ -17,6 +17,7 @@ var metaverseServers = []; var SETTING_METAVERSE_TO_FETCH = "placesAppMetaverseToFetch"; var SETTING_PINNED_METAVERSE = "placesAppPinnedMetaverse"; + var REQUEST_TIMEOUT = 10000; //10 seconds var httpRequest = null; var placesData; @@ -183,6 +184,11 @@ for (var i = 0; i < metaverseServers.length; i++ ) { if (metaverseServers[i].fetch === true) { extractedData = getContent(metaverseServers[i].url + "/api/v1/places?status=online" + "&acash=" + Math.floor(Math.random() * 999999)); + if (extractedData === "") { + metaverseServers[i].error = true; + } else { + metaverseServers[i].error = false; + } try { placesData = JSON.parse(extractedData); processData(metaverseServers[i]); @@ -326,6 +332,10 @@ function getContent(url) { httpRequest = new XMLHttpRequest(); httpRequest.open("GET", url, false); // false for synchronous request + httpRequest.timeout = REQUEST_TIMEOUT; + httpRequest.ontimeout=function(){ + return ""; + }; httpRequest.send( null ); return httpRequest.responseText; }
" + metaverseList[m].url + "" + serverInError + metaverseList[m].url + "