opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 22:02:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

dont spawn new subprocess while shutting down

Browse Source
This commit is contained in:
bergquist
2017-12-25 13:48:50 +01:00
parent 05362a9666
commit 75a54e85dc
7 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/plugins/plugins.go
View File

@ -42,8 +42,8 @@ type PluginManager struct {
log log.Logger
}
func NewPluginManager() (*PluginManager, error) {
Init()
func NewPluginManager(ctx context.Context) (*PluginManager, error) {
Init(ctx)
return &PluginManager{
log: log.New("plugins"),
}, nil
@ -60,7 +60,7 @@ func (p *PluginManager) Run(ctx context.Context) error {
return ctx.Err()
}
func Init() error {
func Init(ctx context.Context) error {
plog = log.New("plugins")
DataSources = make(map[string]*DataSourcePlugin)
@ -98,7 +98,7 @@ func Init() error {
}
for _, ds := range DataSources {
if ds.Backend {
ds.initBackendPlugin(plog)
ds.initBackendPlugin(ctx, plog)
}
ds.initFrontendPlugin()