diff --git a/pkg/plugins/backendplugin/manager.go b/pkg/plugins/backendplugin/manager.go index fe47dc77ad6..2292c8d8519 100644 --- a/pkg/plugins/backendplugin/manager.go +++ b/pkg/plugins/backendplugin/manager.go @@ -34,11 +34,7 @@ var ( ) func init() { - registry.Register(®istry.Descriptor{ - Name: "BackendPluginManager", - Instance: &manager{}, - InitPriority: registry.Low, - }) + registry.RegisterService(&manager{}) } // Manager manages backend plugins. diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index b367639fee9..5894a657286 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -20,7 +20,7 @@ func RegisterService(instance Service) { services = append(services, &Descriptor{ Name: reflect.TypeOf(instance).Elem().Name(), Instance: instance, - InitPriority: Low, + InitPriority: Medium, }) } @@ -114,6 +114,7 @@ func IsDisabled(srv Service) bool { type Priority int const ( - High Priority = 100 - Low Priority = 0 + High Priority = 100 + Medium Priority = 50 + Low Priority = 0 ) diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index 5442637bff4..1f66bc496ce 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -25,14 +25,18 @@ type ProvisioningService interface { } func init() { - registry.RegisterService(NewProvisioningServiceImpl( - func(path string) (dashboards.DashboardProvisioner, error) { - return dashboards.New(path) - }, - notifiers.Provision, - datasources.Provision, - plugins.Provision, - )) + registry.Register(®istry.Descriptor{ + Name: "ProvisioningService", + Instance: NewProvisioningServiceImpl( + func(path string) (dashboards.DashboardProvisioner, error) { + return dashboards.New(path) + }, + notifiers.Provision, + datasources.Provision, + plugins.Provision, + ), + InitPriority: registry.Low, + }) } func NewProvisioningServiceImpl( diff --git a/pkg/services/search/service.go b/pkg/services/search/service.go index 2db02143710..7bfae6cf02f 100644 --- a/pkg/services/search/service.go +++ b/pkg/services/search/service.go @@ -11,11 +11,7 @@ import ( ) func init() { - registry.Register(®istry.Descriptor{ - Name: "SearchService", - Instance: &SearchService{}, - InitPriority: 20, - }) + registry.RegisterService(&SearchService{}) } type Query struct {