mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
This reverts commit 88c11f1cc0.
This commit is contained in:
@@ -39,7 +39,7 @@ import (
|
||||
_ "github.com/grafana/grafana/pkg/services/login/loginservice"
|
||||
_ "github.com/grafana/grafana/pkg/services/ngalert"
|
||||
_ "github.com/grafana/grafana/pkg/services/notifications"
|
||||
"github.com/grafana/grafana/pkg/services/provisioning"
|
||||
_ "github.com/grafana/grafana/pkg/services/provisioning"
|
||||
_ "github.com/grafana/grafana/pkg/services/rendering"
|
||||
_ "github.com/grafana/grafana/pkg/services/search"
|
||||
_ "github.com/grafana/grafana/pkg/services/sqlstore"
|
||||
@@ -73,11 +73,6 @@ func (r *globalServiceRegistry) GetServices() []*registry.Descriptor {
|
||||
return registry.GetServices()
|
||||
}
|
||||
|
||||
type roleRegistry interface {
|
||||
// RegisterFixedRoles registers all roles declared to AccessControl
|
||||
RegisterFixedRoles() error
|
||||
}
|
||||
|
||||
// New returns a new instance of Server.
|
||||
func New(cfg Config) (*Server, error) {
|
||||
s := newServer(cfg)
|
||||
@@ -135,9 +130,7 @@ type Server struct {
|
||||
|
||||
serviceRegistry serviceRegistry
|
||||
|
||||
HTTPServer *api.HTTPServer `inject:""`
|
||||
AccessControl roleRegistry `inject:""`
|
||||
ProvisioningService provisioning.ProvisioningService `inject:""`
|
||||
HTTPServer *api.HTTPServer `inject:""`
|
||||
}
|
||||
|
||||
// init initializes the server and its services.
|
||||
@@ -174,12 +167,7 @@ func (s *Server) init() error {
|
||||
}
|
||||
}
|
||||
|
||||
// Register all fixed roles
|
||||
if err := s.AccessControl.RegisterFixedRoles(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return s.ProvisioningService.RunInitProvisioners()
|
||||
return nil
|
||||
}
|
||||
|
||||
// Run initializes and starts services. This will block until all services have
|
||||
|
||||
Reference in New Issue
Block a user