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

Org: Fix service initialization (#55460)

Browse Source
This commit is contained in:
Emil Tullstedt 2022-09-20 14:28:47 +02:00 committed by GitHub
parent d06ed3226c
commit 4711454b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/org/orgimpl/org.go
View File

@ -9,7 +9,6 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/db"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )
@ -18,18 +17,19 @@ type Service struct {
store store store store
cfg *setting.Cfg cfg *setting.Cfg
log log.Logger log log.Logger
// TODO remove sqlstore // TODO remove sqlstore and use db.DB
sqlStore *sqlstore.SQLStore sqlStore sqlstore.Store
} }
func ProvideService(db db.DB, cfg *setting.Cfg) org.Service { func ProvideService(db sqlstore.Store, cfg *setting.Cfg) org.Service {
return &Service{ return &Service{
store: &sqlStore{ store: &sqlStore{
db: db, db: db,
dialect: db.GetDialect(), dialect: db.GetDialect(),
}, },
cfg: cfg, cfg: cfg,
log: log.New("org service"), log: log.New("org service"),
sqlStore: db,
} }
} }

1
pkg/services/thumbs/crawler_auth.go
View File

@ -24,6 +24,7 @@ func ProvideCrawlerAuthSetupService(serviceAccounts serviceaccounts.Service, ser
log: log.New("oss_crawler_account_setup_service"), log: log.New("oss_crawler_account_setup_service"),
sqlStore: sqlStore, sqlStore: sqlStore,
serviceAccountsStore: serviceAccountsStore, serviceAccountsStore: serviceAccountsStore,
orgService: orgService,
} }
} }