mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-02-26 23:48:55 -06:00
provide configuration for the extension on runtime
This commit is contained in:
@@ -32,7 +32,7 @@ func GraphCommand(cfg *config.Config) cli.Command {
|
||||
}
|
||||
|
||||
// GraphHandler defines the direct server handler.
|
||||
func GraphHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group, cfg *config.Config) error {
|
||||
func GraphHandler(ctx context.Context, cancel context.CancelFunc, gr *run.Group, cfg *config.Config) error {
|
||||
scfg := configureGraph(cfg)
|
||||
logger := command.NewLogger(scfg)
|
||||
m := metrics.New()
|
||||
@@ -56,8 +56,8 @@ func GraphHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group,
|
||||
|
||||
gr.Add(func() error {
|
||||
return server.Run()
|
||||
}, func(_ error) {
|
||||
logger.Info().
|
||||
}, func(err error) {
|
||||
logger.Err(err).
|
||||
Str("transport", "http").
|
||||
Msg("Shutting down server")
|
||||
|
||||
@@ -73,6 +73,7 @@ func configureGraph(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Graph.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Graph.Log.Color = cfg.Log.Color
|
||||
cfg.Graph.Tracing.Enabled = false
|
||||
cfg.Graph.HTTP.Addr = "localhost:9107"
|
||||
cfg.Graph.HTTP.Root = "/"
|
||||
|
||||
return cfg.Graph
|
||||
|
||||
@@ -33,7 +33,7 @@ func HelloCommand(cfg *config.Config) cli.Command {
|
||||
}
|
||||
|
||||
// HelloHandler defines the direct server handler.
|
||||
func HelloHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group, cfg *config.Config) error {
|
||||
func HelloHandler(ctx context.Context, cancel context.CancelFunc, gr *run.Group, cfg *config.Config) error {
|
||||
scfg := configureHello(cfg)
|
||||
logger := command.NewLogger(scfg)
|
||||
m := metrics.New()
|
||||
@@ -47,8 +47,7 @@ func HelloHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
logger.Info().
|
||||
Err(err).
|
||||
logger.Err(err).
|
||||
Str("transport", "http").
|
||||
Msg("Failed to initialize server")
|
||||
|
||||
@@ -57,8 +56,8 @@ func HelloHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group,
|
||||
|
||||
gr.Add(func() error {
|
||||
return server.Run()
|
||||
}, func(_ error) {
|
||||
logger.Info().
|
||||
}, func(err error) {
|
||||
logger.Err(err).
|
||||
Str("transport", "http").
|
||||
Msg("Shutting down server")
|
||||
|
||||
@@ -75,8 +74,7 @@ func HelloHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
logger.Info().
|
||||
Err(err).
|
||||
logger.Err(err).
|
||||
Str("transport", "grpc").
|
||||
Msg("Failed to initialize server")
|
||||
|
||||
@@ -102,7 +100,9 @@ func configureHello(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Hello.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Hello.Log.Color = cfg.Log.Color
|
||||
cfg.Hello.Tracing.Enabled = false
|
||||
cfg.Hello.HTTP.Addr = "localhost:9105"
|
||||
cfg.Hello.HTTP.Root = "/"
|
||||
cfg.Hello.GRPC.Addr = "localhost:9106"
|
||||
|
||||
return cfg.Hello
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ func Server(cfg *config.Config) cli.Command {
|
||||
defer cancel()
|
||||
|
||||
for _, fn := range register.Handlers {
|
||||
fn(ctx, cancel, gr, cfg)
|
||||
fn(ctx, cancel, &gr, cfg)
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
@@ -20,7 +20,7 @@ var (
|
||||
type Command func(*config.Config) cli.Command
|
||||
|
||||
// Handler defines the register handler.
|
||||
type Handler func(context.Context, context.CancelFunc, run.Group, *config.Config) error
|
||||
type Handler func(context.Context, context.CancelFunc, *run.Group, *config.Config) error
|
||||
|
||||
// AddCommand appends a command to Commands.
|
||||
func AddCommand(cmd Command) {
|
||||
|
||||
Reference in New Issue
Block a user