diff --git a/api/config.go b/api/config.go index ebcc515..354ea2a 100644 --- a/api/config.go +++ b/api/config.go @@ -4,7 +4,6 @@ import ( "flag" "github.com/safing/portbase/config" - "github.com/safing/portbase/log" ) // Config Keys. @@ -24,13 +23,12 @@ var ( ) func init() { - flag.StringVar(&listenAddressFlag, "api-address", "", "override api listen address") -} - -func logFlagOverrides() { - if listenAddressFlag != "" { - log.Warning("api: api/listenAddress default config is being overridden by -api-address flag") - } + flag.StringVar( + &listenAddressFlag, + "api-address", + "", + "set api listen address; configuration is stronger", + ) } func getDefaultListenAddress() string { diff --git a/api/main.go b/api/main.go index e47b618..17e2a6d 100644 --- a/api/main.go +++ b/api/main.go @@ -54,7 +54,6 @@ func prep() error { } func start() error { - logFlagOverrides() go Serve() _ = updateAPIKeys(module.Ctx, nil) diff --git a/config/basic_config.go b/config/basic_config.go index ce4a716..6975231 100644 --- a/config/basic_config.go +++ b/config/basic_config.go @@ -18,7 +18,7 @@ var ( ) func init() { - flag.BoolVar(&defaultDevMode, "devmode", false, "enable development mode") + flag.BoolVar(&defaultDevMode, "devmode", false, "enable development mode; configuration is stronger") } func registerBasicOptions() error { diff --git a/metrics/config.go b/metrics/config.go index 9767d76..dfcfc02 100644 --- a/metrics/config.go +++ b/metrics/config.go @@ -21,8 +21,8 @@ var ( ) func init() { - flag.StringVar(&pushFlag, "push-metrics", "", "Set default URL to push prometheus metrics to.") - flag.StringVar(&instanceFlag, "metrics-instance", "", "Set the default global instance label.") + flag.StringVar(&pushFlag, "push-metrics", "", "set default URL to push prometheus metrics to") + flag.StringVar(&instanceFlag, "metrics-instance", "", "set the default global instance label") } func prepConfig() error {