Improve flags

This commit is contained in:
Daniel 2021-05-05 00:11:10 +02:00
parent b04e4be0a4
commit 480807a31c
4 changed files with 9 additions and 12 deletions

View file

@ -4,7 +4,6 @@ import (
"flag" "flag"
"github.com/safing/portbase/config" "github.com/safing/portbase/config"
"github.com/safing/portbase/log"
) )
// Config Keys. // Config Keys.
@ -24,13 +23,12 @@ var (
) )
func init() { func init() {
flag.StringVar(&listenAddressFlag, "api-address", "", "override api listen address") flag.StringVar(
} &listenAddressFlag,
"api-address",
func logFlagOverrides() { "",
if listenAddressFlag != "" { "set api listen address; configuration is stronger",
log.Warning("api: api/listenAddress default config is being overridden by -api-address flag") )
}
} }
func getDefaultListenAddress() string { func getDefaultListenAddress() string {

View file

@ -54,7 +54,6 @@ func prep() error {
} }
func start() error { func start() error {
logFlagOverrides()
go Serve() go Serve()
_ = updateAPIKeys(module.Ctx, nil) _ = updateAPIKeys(module.Ctx, nil)

View file

@ -18,7 +18,7 @@ var (
) )
func init() { func init() {
flag.BoolVar(&defaultDevMode, "devmode", false, "enable development mode") flag.BoolVar(&defaultDevMode, "devmode", false, "enable development mode; configuration is stronger")
} }
func registerBasicOptions() error { func registerBasicOptions() error {

View file

@ -21,8 +21,8 @@ var (
) )
func init() { func init() {
flag.StringVar(&pushFlag, "push-metrics", "", "Set default URL to push prometheus metrics to.") 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(&instanceFlag, "metrics-instance", "", "set the default global instance label")
} }
func prepConfig() error { func prepConfig() error {