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

backend plugins: dont swallow errors

Browse Source
This commit is contained in:
bergquist 2017-12-11 13:16:16 +01:00
parent 026eb9ac36
commit 1af4f7a1b4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/tsdb/models/proxy/wrapper.go
View File

@ -14,8 +14,15 @@ type TsdbWrapper struct {
} }
func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *tsdb.TsdbQuery) (*tsdb.Response, error) { func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *tsdb.TsdbQuery) (*tsdb.Response, error) {
jsonData, _ := ds.JsonData.MarshalJSON() jsonData, err := ds.JsonData.MarshalJSON()
now, _ := ptypes.TimestampProto(query.TimeRange.Now) if err != nil {
return nil, err
}
now, err := ptypes.TimestampProto(query.TimeRange.Now)
if err != nil {
return nil, err
}
pbQuery := &proto.TsdbQuery{ pbQuery := &proto.TsdbQuery{
Datasource: &proto.DatasourceInfo{ Datasource: &proto.DatasourceInfo{