From 38e0d61a5b0154555eb0ddf790ef9e1c3e7a5c7c Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sat, 17 Oct 2020 20:55:05 +0100 Subject: [PATCH] Use env vars --- cmd/refresh.go | 2 +- internal/feeds/refresh.go | 2 +- internal/feeds/store.go | 2 +- main.go | 18 +++--------------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/cmd/refresh.go b/cmd/refresh.go index 128af96..2a91581 100644 --- a/cmd/refresh.go +++ b/cmd/refresh.go @@ -20,7 +20,7 @@ var ( func init() { refreshCmd.Flags().IntVar(&interval, "interval", 15, "How long in minutes to wait before refreshing feeds") - viper.BindPFlag("refreshTimeoutMinutes", refreshCmd.Flags().Lookup("interval")) + viper.BindPFlag("REFRESH_TIMEOUT", refreshCmd.Flags().Lookup("interval")) rootCmd.AddCommand(refreshCmd) } diff --git a/internal/feeds/refresh.go b/internal/feeds/refresh.go index 4865c97..5d06fc5 100644 --- a/internal/feeds/refresh.go +++ b/internal/feeds/refresh.go @@ -14,7 +14,7 @@ var fp = gofeed.NewParser() var feedStore = &FeedStore{} func Refresh() error { - interval := viper.GetInt("refreshTimeoutMinutes") + interval := viper.GetInt("REFRESH_TIMEOUT") for { fmt.Println("Refreshing feeds...") diff --git a/internal/feeds/store.go b/internal/feeds/store.go index 5de4ea2..913098a 100644 --- a/internal/feeds/store.go +++ b/internal/feeds/store.go @@ -10,7 +10,7 @@ import ( func (fs *FeedStore) getDB() *gorm.DB { if fs.db == nil { - db, err := gorm.Open(sqlite.Open(viper.GetString("dbPath")), &gorm.Config{ + db, err := gorm.Open(sqlite.Open(viper.GetString("DB_PATH")), &gorm.Config{ Logger: logger.Default.LogMode(logger.Error), }) if err != nil { diff --git a/main.go b/main.go index b27a195..046a60a 100644 --- a/main.go +++ b/main.go @@ -10,24 +10,12 @@ import ( func main() { // Load config setDefaultConfig() - viper.SetConfigName("config") - viper.SetConfigType("yaml") - viper.AddConfigPath("$HOME/.gopherss") - viper.AddConfigPath(".") - if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); ok { - // Ignore - } else { - panic(err) - } - } else { - viper.WatchConfig() - } + viper.AutomaticEnv() cmd.Execute() } func setDefaultConfig() { - viper.SetDefault("refreshTimeoutMinutes", 15) - viper.SetDefault("dbPath", "./feeds.db") + viper.SetDefault("REFRESH_TIMEOUT", 15) + viper.SetDefault("DB_PATH", "./feeds.db") }