Skip to content

Commit 7046727

Browse files
committed
Flat values for log config
Using a yaml dict for the log config (and only the log config) wasn't really useful, made a gratuitous special case, and made passing log conf as environment variable much harder.
1 parent 10f459e commit 7046727

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ in uppercase, prefixed by "KF", and with underscore instead of dashs. ie.:
8686
```
8787
export KF_GIT_URL=https://user:[email protected]/myorg/myrepos.git
8888
export KF_LOCAL_DIR=/tmp/kfdump
89+
export KF_LOG_LEVEL=info
8990
9091
# exception, for kubectl compatibility:
9192
export KUBECONFIG=/tmp/kconfig

assets/katafygio.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
#api-server: http://127.0.0.1:8080
55
#kube-config: /etc/kubernetes/config
66

7-
log:
8-
level: "info"
9-
output: "stderr"
10-
#server: "localhost:514" # mandatory if log-output: "syslog"
7+
log-level: "info"
8+
log-output: "stderr"
9+
#log-server: "localhost:514" # mandatory if log-output: "syslog"
1110

1211
# Where to save the yaml dumps
1312
local-dir: /var/cache/katafygio

cmd/configfile.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func loadConfigFile() {
3030
viper.SetEnvKeyReplacer(replacer)
3131
viper.AutomaticEnv()
3232

33-
if err := viper.ReadInConfig(); err == nil {
34-
RootCmd.Printf("Using config file: %s", viper.ConfigFileUsed())
33+
if err := viper.ReadInConfig(); err != nil {
34+
RootCmd.Printf("Can't read config file: %v\n", err)
3535
}
3636
}

cmd/flags.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ func init() {
5454
bindPFlag("dump-only", "dump-only")
5555

5656
RootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "v", "info", "Log level")
57-
bindPFlag("log.level", "log-level")
57+
bindPFlag("log-level", "log-level")
5858

5959
RootCmd.PersistentFlags().StringVarP(&logOutput, "log-output", "o", "stderr", "Log output")
60-
bindPFlag("log.output", "log-output")
60+
bindPFlag("log-output", "log-output")
6161

6262
RootCmd.PersistentFlags().StringVarP(&logServer, "log-server", "r", "", "Log server (if using syslog)")
63-
bindPFlag("log.server", "log-server")
63+
bindPFlag("log-server", "log-server")
6464

6565
RootCmd.PersistentFlags().StringVarP(&localDir, "local-dir", "e", "./kubernetes-backup", "Where to dump yaml files")
6666
bindPFlag("local-dir", "local-dir")
@@ -90,9 +90,9 @@ func bindConf(cmd *cobra.Command, args []string) {
9090
kubeConf = viper.GetString("kube-config")
9191
dryRun = viper.GetBool("dry-run")
9292
dumpMode = viper.GetBool("dump-only")
93-
logLevel = viper.GetString("log.level")
94-
logOutput = viper.GetString("log.output")
95-
logServer = viper.GetString("log.server")
93+
logLevel = viper.GetString("log-level")
94+
logOutput = viper.GetString("log-output")
95+
logServer = viper.GetString("log-server")
9696
filter = viper.GetString("filter")
9797
localDir = viper.GetString("local-dir")
9898
gitURL = viper.GetString("git-url")

0 commit comments

Comments
 (0)