phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle error==RETRY responses from the server a little better - prevents slow refresh after a long idle period when the botguard data has expired

Browse Source
This commit is contained in:
Jon Atkins
2015-01-31 19:20:48 +00:00
parent ee9dbef1a2
commit 57bcb457e4
1 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/map_data_request.js
View File

@ -485,6 +485,7 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
var successTiles = []; var successTiles = [];
var errorTiles = []; var errorTiles = [];
var retryTiles = [];
var timeoutTiles = []; var timeoutTiles = [];
if (!success || !data || !data.result) { if (!success || !data || !data.result) {
@ -492,6 +493,18 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
//request failed - requeue all the tiles(?) //request failed - requeue all the tiles(?)
if (data && data.error && data.error == 'RETRY') {
// the server can sometimes ask us to retry a request. this is botguard related, I believe
for (var i in tiles) {
var id = tiles[i];
retryTiles.push(id);
this.debugTiles.setState (id, 'retrying');
}
window.runHooks('requestFinished', {success: false});
} else {
for (var i in tiles) { for (var i in tiles) {
var id = tiles[i]; var id = tiles[i];
errorTiles.push(id); errorTiles.push(id);
@ -499,6 +512,7 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
} }
window.runHooks('requestFinished', {success: false}); window.runHooks('requestFinished', {success: false});
}
} else { } else {
@ -548,11 +562,18 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
} }
// set the queue delay based on any errors or timeouts // set the queue delay based on any errors or timeouts
// NOTE: retryTimes are retried at the regular delay - no longer wait as for error/timeout cases
var nextQueueDelay = errorTiles.length > 0 ? this.BAD_REQUEST_RUN_QUEUE_DELAY : var nextQueueDelay = errorTiles.length > 0 ? this.BAD_REQUEST_RUN_QUEUE_DELAY :
timeoutTiles.length > 0 ? this.TIMEOUT_REQUEST_RUN_QUEUE_DELAY : timeoutTiles.length > 0 ? this.TIMEOUT_REQUEST_RUN_QUEUE_DELAY :
this.RUN_QUEUE_DELAY; this.RUN_QUEUE_DELAY;
var statusMsg = 'getEntities status: '+tiles.length+' tiles: ';
statusMsg += successTiles.length+' successful';
if (retryTiles.length) statusMsg += ', '+retryTiles.length+' retried';
if (timeoutTiles.length) statusMsg += ', '+timeoutTiles.length+' timed out';
if (errorTiles.length) statusMsg += ', '+errorTiles.length+' failed';
statusMsg += '. delay '+nextQueueDelay+' seconds';
console.log (statusMsg);
console.log ('getEntities status: '+tiles.length+' tiles: '+successTiles.length+' successful, '+timeoutTiles.length+' timed out, '+errorTiles.length+' failed. delay '+nextQueueDelay+' seconds');
// requeue any 'timeout' tiles immediately // requeue any 'timeout' tiles immediately
if (timeoutTiles.length > 0) { if (timeoutTiles.length > 0) {
@ -564,6 +585,15 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
} }
} }
if (retryTiles.length > 0) {
for (var i in retryTiles) {
var id = retryTiles[i];
delete this.requestedTiles[id];
this.requeueTile(id, false); //tiles from a error==RETRY request are requeued without counting it as an error
}
}
if (errorTiles.length > 0) { if (errorTiles.length > 0) {
for (var i in errorTiles) { for (var i in errorTiles) {
var id = errorTiles[i]; var id = errorTiles[i];