use value from config

This commit is contained in:
A.Unger
2019-12-18 13:11:33 +01:00
parent b922327074
commit 5708f07a37
3 changed files with 3 additions and 4 deletions

View File

@@ -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)),

View File

@@ -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,

View File

@@ -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),