From d4728c6d012be9b7d7bc488c00c918e4b89147cd Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Thu, 12 Dec 2019 10:06:26 +0100
Subject: [PATCH] provide configuration for the extension on runtime

---
 pkg/command/graph.go    |  7 ++++---
 pkg/command/hello.go    | 14 +++++++-------
 pkg/command/server.go   |  2 +-
 pkg/register/command.go |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkg/command/graph.go b/pkg/command/graph.go
index 1a42a1342c..63986c15ac 100644
--- a/pkg/command/graph.go
+++ b/pkg/command/graph.go
@@ -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
diff --git a/pkg/command/hello.go b/pkg/command/hello.go
index ec3d5c8424..42d63c5730 100644
--- a/pkg/command/hello.go
+++ b/pkg/command/hello.go
@@ -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
 }
diff --git a/pkg/command/server.go b/pkg/command/server.go
index f6f920a79a..de2fc15234 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -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)
 			}
 
 			{
diff --git a/pkg/register/command.go b/pkg/register/command.go
index a8da7ba440..a2d8cd63e4 100644
--- a/pkg/register/command.go
+++ b/pkg/register/command.go
@@ -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) {