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

pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated.

Browse Source 
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/influxdb/influxdb.go:106:3⚠️ the surrounding loop is unconditionally terminated (SA4004) (megacheck)
This commit is contained in:
Mario Trangoni 2018-11-09 19:40:07 +01:00
parent 960651e510
commit e351e6e211
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/tsdb/influxdb/influxdb.go
View File

@ -96,16 +96,15 @@ func (e *InfluxDBExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
} }
func (e *InfluxDBExecutor) getQuery(dsInfo *models.DataSource, queries []*tsdb.Query, context *tsdb.TsdbQuery) (*Query, error) { func (e *InfluxDBExecutor) getQuery(dsInfo *models.DataSource, queries []*tsdb.Query, context *tsdb.TsdbQuery) (*Query, error) {
for _, v := range queries { // The model supports multiple queries, but right now this is only used from
// alerting so we only needed to support batch executing 1 query at a time.
query, err := e.QueryParser.Parse(v.Model, dsInfo) if len(queries) > 0 {
query, err := e.QueryParser.Parse(queries[0].Model, dsInfo)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return query, nil return query, nil
} }
return nil, fmt.Errorf("query request contains no queries") return nil, fmt.Errorf("query request contains no queries")
} }