From cdd5ba61987446ef46e9dc12299b533ef95c25ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 8 Jun 2017 21:41:58 +0200 Subject: [PATCH] fix: influxdb test data source error handling now works better, fixes #8577 --- public/app/plugins/datasource/influxdb/datasource.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 6af6a849e95..0cbdcabcf10 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -200,10 +200,7 @@ export default class InfluxDatasource { } return { status: "success", message: "Data source is working", title: "Success" }; }).catch(err => { - if (err.data && err.message) { - return { status: "error", message: err.data.message, title: "InfluxDB Error" }; - } - return { status: "error", message: err.toString(), title: "InfluxDB Error" }; + return { status: "error", message: err.message, title: "Test Failed" }; }); } @@ -250,9 +247,9 @@ export default class InfluxDatasource { }, function(err) { if (err.status !== 0 || err.status >= 300) { 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 { - 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 }; } } });