diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go index 58e8f43ebd..f6a2ed6ae1 100644 --- a/settings/pkg/command/root.go +++ b/settings/pkg/command/root.go @@ -33,7 +33,7 @@ func Execute() error { Before: func(c *cli.Context) error { cfg.Service.Version = version.String - return ParseConfig(c, cfg) + return nil }, Commands: []*cli.Command{ @@ -88,22 +88,22 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error { switch err.(type) { case viper.ConfigFileNotFoundError: logger.Info(). - Msg("Continue without config") + Msg("no config found on preconfigured location") case viper.UnsupportedConfigError: logger.Fatal(). Err(err). - Msg("Unsupported config type") + Msg("unsupported config type") default: logger.Fatal(). Err(err). - Msg("Failed to read config") + Msg("failed to read config") } } if err := viper.Unmarshal(&cfg); err != nil { logger.Fatal(). Err(err). - Msg("Failed to parse config") + Msg("failed to parse config") } return nil diff --git a/settings/pkg/flagset/flagset.go b/settings/pkg/flagset/flagset.go index 2f3e4f0fc6..22eb72c5fe 100644 --- a/settings/pkg/flagset/flagset.go +++ b/settings/pkg/flagset/flagset.go @@ -8,13 +8,6 @@ import ( // RootWithConfig applies cfg to the root flagset func RootWithConfig(cfg *config.Config) []cli.Flag { return []cli.Flag{ - &cli.StringFlag{ - Name: "config-file", - Value: "", - Usage: "Path to config file", - EnvVars: []string{"SETTINGS_CONFIG_FILE"}, - Destination: &cfg.File, - }, &cli.StringFlag{ Name: "log-level", Value: "info", @@ -55,6 +48,13 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag { // ServerWithConfig applies cfg to the root flagset func ServerWithConfig(cfg *config.Config) []cli.Flag { return []cli.Flag{ + &cli.StringFlag{ + Name: "config-file", + Value: "", + Usage: "Path to config file", + EnvVars: []string{"SETTINGS_CONFIG_FILE"}, + Destination: &cfg.File, + }, &cli.BoolFlag{ Name: "tracing-enabled", Usage: "Enable sending traces",