Move service handler init to the server command

We kept two instances of the service handler in parallel
This commit is contained in:
Benedikt Kulmann
2020-09-11 12:47:43 +02:00
parent 177d41211b
commit c661312f5d
7 changed files with 43 additions and 76 deletions
+7
View File
@@ -43,6 +43,11 @@ func Server(cfg *config.Config) *cli.Command {
defer cancel()
handler, err := svc.New(svc.Logger(logger), svc.Config(cfg))
if err != nil {
logger.Fatal().Err(err).Msg("could not initialize service handler")
}
{
server := http.Server(
http.Logger(logger),
@@ -52,6 +57,7 @@ func Server(cfg *config.Config) *cli.Command {
http.Metrics(mtrcs),
http.Flags(flagset.RootWithConfig(cfg)),
http.Flags(flagset.ServerWithConfig(cfg)),
http.Handler(handler),
)
gr.Add(server.Run, func(_ error) {
@@ -70,6 +76,7 @@ func Server(cfg *config.Config) *cli.Command {
grpc.Context(ctx),
grpc.Config(cfg),
grpc.Metrics(mtrcs),
grpc.Handler(handler),
)
gr.Add(func() error {