Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improved both api request() in zabbixAPI and zabbixAPIService.

Browse Source 
Improved api request error handling.
This commit is contained in:
Alexander Zobnin
2016-01-31 15:06:36 +03:00
parent 1d3e2337a2
commit 63cb31003c
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/datasource-zabbix/zabbixAPI.js
View File

@@ -20,7 +20,7 @@ function (angular, _) {
this.url = api_url;
this.username = username;
this.password = password;
this.auth = null;
this.auth = "";
this.requestOptions = {
basicAuth: basicAuth,
@@ -38,33 +38,29 @@ function (angular, _) {
p.request = function(method, params) {
var self = this;
if (this.auth) {
return ZabbixAPIService.request(this.url, method, params, this.requestOptions, this.auth)
.then(function(result) {
return result;
},
return ZabbixAPIService.request(this.url, method, params, this.requestOptions, this.auth)
.then(function(result) {
return result;
},
// Handle errors
function(error) {
if (error.message === "Session terminated, re-login, please.") {
throw 'expired';
return self.login().then(function(auth) {
self.auth = auth;
return ZabbixAPIService.request(self.url, method, params, self.requestOptions, self.auth);
});
}
});
} else {
// Login first
//throw 'unauthenticated';
return self.loginOnce().then(function(auth) {
self.auth = auth;
return ZabbixAPIService.request(self.url, method, params, self.requestOptions, self.auth);
// Handle errors
function(error) {
if (isAuthError(error.data)) {
return self.loginOnce().then(function() {
return self.request(method, params);
});
}
});
}
};
function isAuthError(message) {
return (
message === "Session terminated, re-login, please." ||
message === "Not authorised." ||
message === "Not authorized."
);
}
/**
* When API unauthenticated or auth token expired each request produce login()
* call. But auth token is common to all requests. This function wraps login() method
@@ -78,6 +74,7 @@ function (angular, _) {
self.loginPromise = deferred.promise;
self.login().then(function(auth) {
self.loginPromise = null;
self.auth = auth;
deferred.resolve(auth);
});
} else {