Add Namespace flag (#21)

* added http-namespace to the flagset

* update description

* added namespace option to the options list

* added namespace as a config parameter

* updated docs

* fix default value override
This commit is contained in:
Alex Unger
2019-12-27 13:09:27 +01:00
committed by Jörn Friedrich Dreyer
parent a0ebc35b80
commit 91e17d0cde
5 changed files with 27 additions and 8 deletions

View File

@@ -129,6 +129,9 @@ If you prefer to configure the service with commandline flags you can see the av
--http-addr
: Address to bind http server, defaults to `0.0.0.0:9120`
--http-namespace
: Namespace for internal services communication, defaults to `com.owncloud.web`
--http-root
: Root path of http server, defaults to `/`

View File

@@ -17,8 +17,9 @@ type Debug struct {
// HTTP defines the available http configuration.
type HTTP struct {
Addr string
Root string
Addr string
Namespace string
Root string
}
// Tracing defines the available tracing configuration.

View File

@@ -127,6 +127,13 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
EnvVar: "GRAPH_HTTP_ROOT",
Destination: &cfg.HTTP.Root,
},
&cli.StringFlag{
Name: "http-namespace",
Value: "com.owncloud.web",
Usage: "Set the base namespace for the http service for service discovery",
EnvVar: "GRAPH_HTTP_NAMESPACE",
Destination: &cfg.HTTP.Namespace,
},
&cli.StringFlag{
Name: "ldap-network",
Value: "tcp",

View File

@@ -14,11 +14,12 @@ type Option func(o *Options)
// Options defines the available options for this package.
type Options struct {
Logger log.Logger
Context context.Context
Config *config.Config
Metrics *metrics.Metrics
Flags []cli.Flag
Logger log.Logger
Context context.Context
Config *config.Config
Metrics *metrics.Metrics
Flags []cli.Flag
Namespace string
}
// newOptions initializes the available default options.
@@ -66,3 +67,10 @@ func Flags(val []cli.Flag) Option {
o.Flags = append(o.Flags, val...)
}
}
// Namespace provides a function to set the Namespace option.
func Namespace(val string) Option {
return func(o *Options) {
o.Namespace = val
}
}

View File

@@ -14,7 +14,7 @@ func Server(opts ...Option) (http.Service, error) {
service := http.NewService(
http.Logger(options.Logger),
http.Namespace("go.micro.web"),
http.Namespace(options.Config.HTTP.Namespace),
http.Name("graph"),
http.Version(version.String),
http.Address(options.Config.HTTP.Addr),