From 133947df0aa00921148c689be1d56b2459180087 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Wed, 31 May 2017 12:36:39 +0200 Subject: [PATCH] Updating xhr request * Querying when request has failed * Added a maximum consecutive query parameter to limit query when server has shutdown * By default I've put it to -1 (no maximum), it can be modified * Stopping with an error when too many failed query * Removing log message in torrents.js --- public/js/query.js | 11 ++++++++++- public/js/torrents.js | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/public/js/query.js b/public/js/query.js index b71e7448..c53d106c 100644 --- a/public/js/query.js +++ b/public/js/query.js @@ -1,4 +1,6 @@ var Query = { + Failed:0, + MaxConsecutingFailing:-1, Get: function(url, renderer, callback) { var xhr = new XMLHttpRequest(); console.log(url) @@ -6,8 +8,15 @@ var Query = { xhr.responseType = 'json'; xhr.onload = function(e) { if (this.status == 200) { + Query.Failed = 0; renderer(this.response); - callback(this.response) + callback(this.response); + } else { + console.log("Error when refresh") + Query.Failed++; + console.log("Attempt to refresh "+Query.Failed+"..."); + if ((Query.MaxConsecutingFailing == -1) || (Query.Failed < Query.MaxConsecutingFailing)) Query.Get(); + else console.error("Too many attempts, stopping...") } }; xhr.send(); diff --git a/public/js/torrents.js b/public/js/torrents.js index 25118ea4..ca3e18df 100644 --- a/public/js/torrents.js +++ b/public/js/torrents.js @@ -12,7 +12,6 @@ var Torrents = { }, Refresh: function() { if (this.CanRefresh) { - console.log("Start Refresh...") this.timeout = setTimeout(function() { var searchArgs = (window.location.search != "") ? window.location.search.substr(1) : "" searchArgs = (Torrents.LastID > 0) ? "?fromID="+Torrents.LastID+"&"+searchArgs : "?"+searchArgs