s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

task 584: Add a timeout of 10 seconds for reconciliation service to respond

Browse Source 
http://code.google.com/p/google-refine/issues/detail?id=584

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2580 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2012-10-12 22:29:53 +00:00
parent 3ff52ba494
commit 12308c2840
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
main/webapp/modules/core/scripts/reconciliation/recon-manager.js
View File

@ -75,34 +75,35 @@ ReconciliationManager.registerService = function(service) {
}; };
ReconciliationManager.registerStandardService = function(url, f) { ReconciliationManager.registerStandardService = function(url, f) {
var dismissBusy = DialogSystem.showBusy(); var dismissBusy = DialogSystem.showBusy("Contacting reconciliation service...");
$.getJSON( $.ajax(
url + (url.contains("?") ? "&" : "?") + "callback=?", url,
null, { "dataType" : "jsonp",
function(data) { "timeout":10000
data.url = url; }
data.ui = { "handler" : "ReconStandardServicePanel" };
index = ReconciliationManager.customServices.length +
ReconciliationManager.standardServices.length;
ReconciliationManager.standardServices.push(data);
ReconciliationManager._rebuildMap();
ReconciliationManager.save();
dismissBusy();
if (f) {
f(index);
}
},
"jsonp"
) )
.success(function(data, textStatus, jqXHR) {
data.url = url;
data.ui = { "handler" : "ReconStandardServicePanel" };
index = ReconciliationManager.customServices.length +
ReconciliationManager.standardServices.length;
ReconciliationManager.standardServices.push(data);
ReconciliationManager._rebuildMap();
ReconciliationManager.save();
dismissBusy();
if (f) {
f(index);
}
})
.error(function(jqXHR, textStatus, errorThrown) { .error(function(jqXHR, textStatus, errorThrown) {
dismissBusy(); dismissBusy();
alert('Error contacting recon service: '+textStatus + ' : ' + errorThrown); alert('Error contacting recon service: ' + textStatus + ' : ' + errorThrown + ' - ' + url);
}); });
}; };