IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: influxdb test data source error handling now works better, fixes #8577

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-08 21:41:58 +02:00
parent 6c04057285
commit cdd5ba6198
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/datasource/influxdb/datasource.ts
View File

@@ -200,10 +200,7 @@ export default class InfluxDatasource {
} }
return { status: "success", message: "Data source is working", title: "Success" }; return { status: "success", message: "Data source is working", title: "Success" };
}).catch(err => { }).catch(err => {
if (err.data && err.message) { return { status: "error", message: err.message, title: "Test Failed" };
return { status: "error", message: err.data.message, title: "InfluxDB Error" };
}
return { status: "error", message: err.toString(), title: "InfluxDB Error" };
}); });
} }
@@ -250,9 +247,9 @@ export default class InfluxDatasource {
}, function(err) { }, function(err) {
if (err.status !== 0 || err.status >= 300) { if (err.status !== 0 || err.status >= 300) {
if (err.data && err.data.error) { if (err.data && err.data.error) {
throw { message: 'InfluxDB Error Response: ' + err.data.error, data: err.data, config: err.config }; throw { message: 'InfluxDB Error: ' + err.data.error, data: err.data, config: err.config };
} else { } else {
throw { message: 'InfluxDB Error: ' + err.message, data: err.data, config: err.config }; throw { message: 'Network Error: ' + err.statusText + '(' + err.status + ')', data: err.data, config: err.config };
} }
} }
}); });