add missing commands and unify service / namespace options

This commit is contained in:
Willy Kloucek
2021-11-24 18:30:20 +01:00
committed by Jörn Friedrich Dreyer
parent 6621ac2ef6
commit 3b5a33590e
66 changed files with 516 additions and 218 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ func Execute(cfg *config.Config) error {
},
Before: func(c *cli.Context) error {
cfg.Server.Version = version.String
cfg.Service.Version = version.String
return nil
},
+4 -4
View File
@@ -43,15 +43,15 @@ func Server(cfg *config.Config) *cli.Command {
defer cancel()
metrics.BuildInfo.WithLabelValues(cfg.Server.Version).Set(1)
metrics.BuildInfo.WithLabelValues(cfg.Service.Version).Set(1)
service := grpc.NewService(
grpc.Logger(logger),
grpc.Context(ctx),
grpc.Config(cfg),
grpc.Name(cfg.Server.Name),
grpc.Namespace(cfg.Server.Namespace),
grpc.Address(cfg.Server.Address),
grpc.Name(cfg.Service.Name),
grpc.Namespace(cfg.GRPC.Namespace),
grpc.Address(cfg.GRPC.Addr),
grpc.Metrics(metrics),
)
+1 -1
View File
@@ -21,7 +21,7 @@ func PrintVersion(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
reg := registry.GetRegistry()
services, err := reg.GetService(cfg.Server.Namespace + "." + cfg.Server.Name)
services, err := reg.GetService(cfg.GRPC.Namespace + "." + cfg.Service.Name)
if err != nil {
fmt.Println(fmt.Errorf("could not get thumbnails services from the registry: %v", err))
return err