From 5708f07a37fecefa8093cecf5e779f067f1073f4 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Wed, 18 Dec 2019 13:11:33 +0100
Subject: [PATCH] use value from config

---
 pkg/command/server.go     | 3 +--
 pkg/flagset/flagset.go    | 2 +-
 pkg/server/http/server.go | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/command/server.go b/pkg/command/server.go
index 8b47339a6..77c75d738 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -38,7 +38,6 @@ func Server(cfg *config.Config) cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
-			httpNamespace := c.String("http-namespace")
 
 			if cfg.Tracing.Enabled {
 				switch t := cfg.Tracing.Type; t {
@@ -136,7 +135,7 @@ func Server(cfg *config.Config) cli.Command {
 				server, err := http.Server(
 					http.Logger(logger),
 					http.Context(ctx),
-					http.Namespace(httpNamespace),
+					http.Namespace(cfg.Phoenix.Namespace),
 					http.Config(cfg),
 					http.Metrics(metrics),
 					http.Flags(flagset.RootWithConfig(cfg)),
diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go
index 9c1567dc6..80c93fa13 100644
--- a/pkg/flagset/flagset.go
+++ b/pkg/flagset/flagset.go
@@ -143,7 +143,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "http-namespace",
-			Value:       "com.owncloud",
+			Value:       "com.owncloud.web",
 			Usage:       "Set the base namespace for the http namespace",
 			EnvVar:      "PHOENIX_NAMESPACE",
 			Destination: &cfg.Phoenix.Namespace,
diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go
index 65e50f7c7..c8f89645a 100644
--- a/pkg/server/http/server.go
+++ b/pkg/server/http/server.go
@@ -14,7 +14,7 @@ func Server(opts ...Option) (http.Service, error) {
 	service := http.NewService(
 		http.Logger(options.Logger),
 		http.Namespace(options.Namespace),
-		http.Name("web.phoenix"),
+		http.Name("phoenix"),
 		http.Version(version.String),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),