github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2080 from sman591/ui-aborted-requests 

ui: don’t consider aborted requests complete
pull/2065/merge
Fabian Reinartz 2016-10-13 08:25:32 +02:00 committed by GitHub
parent 4f96d28e60 b76d59e68b
commit 5238a6845e
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
web/ui/bindata.go
View File

File diff suppressed because one or more lines are too long

5
web/ui/static/js/graph.js
View File

@ -364,7 +364,10 @@ Prometheus.Graph.prototype.submitQuery = function() {
self.showError("Error executing query: " + err); self.showError("Error executing query: " + err);
} }
}, },
complete: function() { complete: function(xhr, resp) {
if (resp == "abort") {
return;
}
var duration = new Date().getTime() - startTime; var duration = new Date().getTime() - startTime;
self.evalStats.html("Load time: " + duration + "ms <br /> Resolution: " + resolution + "s"); self.evalStats.html("Load time: " + duration + "ms <br /> Resolution: " + resolution + "s");
self.spinner.hide(); self.spinner.hide();