Fix connection errors handling, fixes #236.

This commit is contained in:
Alexander Zobnin
2016-09-24 11:08:22 +03:00
parent 3a713846b6
commit dfbcce9c8f
2 changed files with 25 additions and 18 deletions

View File

@@ -51,19 +51,23 @@ class ZabbixAPICoreService {
requestOptions.headers.Authorization = options.basicAuth;
}
this.backendSrv.datasourceRequest(requestOptions).then(function (response) {
// General connection issues
if (!response.data) {
deferred.reject(response);
}
this.backendSrv.datasourceRequest(requestOptions)
.then((response) => {
// General connection issues
if (!response.data) {
deferred.reject(response);
}
// Handle Zabbix API errors
else if (response.data.error) {
deferred.reject(response.data.error);
}
// Handle Zabbix API errors
else if (response.data.error) {
deferred.reject(response.data.error);
}
deferred.resolve(response.data.result);
}, (error) => {
deferred.reject(error.err);
});
deferred.resolve(response.data.result);
});
return deferred.promise;
}