Mercurial > gemma
changeset 221:696c19abe869
Argh! If one is using its own storage for config like we do
the config loaded by viper needs to be injected back into
cobra [https://github.com/spf13/cobra/issues/367].
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 24 Jul 2018 18:21:31 +0200 |
| parents | 11d1a488b08f |
| children | cfde876fbaf9 |
| files | cmd/gemma/root.go config/config.go |
| diffstat | 2 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd/gemma/root.go Tue Jul 24 17:45:17 2018 +0200 +++ b/cmd/gemma/root.go Tue Jul 24 18:21:31 2018 +0200 @@ -14,6 +14,7 @@ "gemma.intevation.de/gemma/config" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" + "github.com/spf13/pflag" "github.com/spf13/viper" ) @@ -23,10 +24,13 @@ Run: start, } +// This is not part of the persistent config. +var configFile string + func init() { cobra.OnInitialize(initConfig) fl := rootCmd.PersistentFlags - fl().StringVarP(&config.Config.File, "config", "c", "", "config file (default is $HOME/.gemma.toml)") + fl().StringVarP(&configFile, "config", "c", "", "config file (default is $HOME/.gemma.toml)") fl().StringVarP(&config.Config.DBHost, "dbhost", "H", "localhost", "host of the database") fl().UintVarP(&config.Config.DBPort, "dbport", "P", 5432, "port of the database") fl().StringVarP(&config.Config.DBName, "dbname", "d", "gemma", "name of the database") @@ -52,9 +56,9 @@ func initConfig() { // Don't forget to read config either from cfgFile or from home directory! - if config.Config.File != "" { + if configFile != "" { // Use config file from the flag. - viper.SetConfigFile(config.Config.File) + viper.SetConfigFile(configFile) } else { // Find home directory. home, err := homedir.Dir() @@ -68,7 +72,7 @@ viper.SetConfigName(".gemma") } if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); ok { + if _, ok := err.(viper.ConfigFileNotFoundError); ok && configFile == "" { // Don't bother if not found. return } @@ -76,8 +80,22 @@ } } +func injectViper(cmd *cobra.Command) { + cmd.Flags().VisitAll(func(f *pflag.Flag) { + if !f.Changed { + if viper.IsSet(f.Name) { + cmd.Flags().Set(f.Name, viper.GetString(f.Name)) + } + } + }) +} + func start(cmd *cobra.Command, args []string) { + // XXX: This hack is needed because we have our + // own config storage. + injectViper(cmd) + // Install connection pool cp, err := auth.NewConnectionPool(config.Config.SessionStore) if err != nil { @@ -89,7 +107,6 @@ if err != nil { log.Fatalf("error: %v\n", err) } - log.Printf("web: %s\n", p) mux := http.NewServeMux() mux.Handle("/", http.StripPrefix("/", http.FileServer(http.Dir(p)))) mux.HandleFunc("/api/token", token)