mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix: revert module server initialization from CLI (#74386)
not-a-revert reversion of module server initialization
This commit is contained in:
parent
5c9aeaef41
commit
cc1205d6ba
@ -103,7 +103,7 @@ func RunServer(opts ServerOptions) error {
|
||||
return err
|
||||
}
|
||||
|
||||
s, err := server.InitializeModuleServer(
|
||||
s, err := server.Initialize(
|
||||
cfg,
|
||||
server.Options{
|
||||
PidFile: PidFile,
|
||||
@ -132,7 +132,7 @@ func validPackaging(packaging string) string {
|
||||
return "unknown"
|
||||
}
|
||||
|
||||
func listenToSystemSignals(ctx context.Context, s *server.ModuleServer) {
|
||||
func listenToSystemSignals(ctx context.Context, s *server.Server) {
|
||||
signalChan := make(chan os.Signal, 1)
|
||||
sighupChan := make(chan os.Signal, 1)
|
||||
|
||||
|
@ -11,11 +11,11 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/grafana/dskit/services"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
|
||||
"github.com/grafana/grafana/pkg/api"
|
||||
"github.com/grafana/grafana/pkg/infra/log"
|
||||
"github.com/grafana/grafana/pkg/modules"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user