Skip to content

Commit

Permalink
adjust konnectd
Browse files Browse the repository at this point in the history
  • Loading branch information
refs committed Nov 4, 2020
1 parent 412a02b commit 8bef86c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions konnectd/pkg/command/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions konnectd/pkg/flagset/flagset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{"KONNECTD_CONFIG_FILE"},
Destination: &cfg.File,
},
&cli.StringFlag{
Name: "log-level",
Value: "info",
Expand Down Expand Up @@ -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{"KONNECTD_CONFIG_FILE"},
Destination: &cfg.File,
},
&cli.BoolFlag{
Name: "tracing-enabled",
Usage: "Enable sending traces",
Expand Down

0 comments on commit 8bef86c

Please sign in to comment.