From c018b4bd6e6ac89fa58db6f4fe36b6e42bc4c23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 4 Mar 2014 21:49:06 +0100 Subject: [PATCH] fix for influxdb as default datasource, #103 --- src/app/services/datasourceSrv.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/services/datasourceSrv.js b/src/app/services/datasourceSrv.js index 9a943fb5044..a0609508e4b 100644 --- a/src/app/services/datasourceSrv.js +++ b/src/app/services/datasourceSrv.js @@ -14,7 +14,16 @@ function (angular, _, config) { var defaultDatasource = _.findWhere(_.values(config.datasources), { default: true } ); - this.default = new GraphiteDatasource(defaultDatasource); + this.default = datasourceFactory(defaultDatasource); + + function datasourceFactory(ds) { + switch(ds.type) { + case 'graphite': + return new GraphiteDatasource(ds); + case 'influxdb': + return new InfluxDatasource(ds); + } + } this.get = function(name) { if (!name) { return this.default; } @@ -24,12 +33,7 @@ function (angular, _, config) { return null; } - switch(ds.type) { - case 'graphite': - return new GraphiteDatasource(ds); - case 'influxdb': - return new InfluxDatasource(ds); - } + return datasourceFactory(ds); }; this.listOptions = function() {