public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nil logger in SqlStore (#54726)

Browse Source
This commit is contained in:
George Robinson
2022-09-05 18:24:19 +01:00
committed by GitHub
parent d5d7e920a0
commit c4d32dd687
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/cache.go
+2 -2
View File
@@ -52,7 +52,7 @@ func (dc *CacheServiceImpl) GetDatasource(
dc.logger.Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgID)
query := &datasources.GetDataSourceQuery{Id: datasourceID, OrgId: user.OrgID}
ss := SqlStore{db: dc.SQLStore}
ss := SqlStore{db: dc.SQLStore, logger: dc.logger}
err := ss.GetDataSource(ctx, query)
if err != nil {
return nil, err
@@ -92,7 +92,7 @@ func (dc *CacheServiceImpl) GetDatasourceByUID(
dc.logger.Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgID)
query := &datasources.GetDataSourceQuery{Uid: datasourceUID, OrgId: user.OrgID}
ss := SqlStore{db: dc.SQLStore}
ss := SqlStore{db: dc.SQLStore, logger: dc.logger}
err := ss.GetDataSource(ctx, query)
if err != nil {
return nil, err
pkg/services/datasources/service/store.go
+2 -2
View File
@@ -36,8 +36,8 @@ type SqlStore struct {
logger log.Logger
}
func CreateStore(db sqlstore.Store) *SqlStore {
return &SqlStore{db: db}
func CreateStore(db sqlstore.Store, logger log.Logger) *SqlStore {
return &SqlStore{db: db, logger: logger}
}
// GetDataSource adds a datasource to the query model by querying by org_id as well as