refactor datasource caching

This commit is contained in:
Marcus Efraimsson
2018-10-26 10:40:33 +02:00
parent 1dc8b898bb
commit cfb061ddab
9 changed files with 109 additions and 55 deletions

View File

@@ -25,8 +25,11 @@ func (hs *HTTPServer) QueryMetrics(c *m.ReqContext, reqDto dtos.MetricRequest) R
return Error(400, "Query missing datasourceId", nil)
}
ds, err := hs.getDatasourceFromCache(datasourceId, c)
ds, err := hs.DatasourceCache.GetDatasource(datasourceId, c.SignedInUser, c.SkipCache)
if err != nil {
if err == m.ErrDataSourceAccessDenied {
return Error(403, "Access denied to datasource", nil)
}
return Error(500, "Unable to load datasource meta data", err)
}