fix: viper not looking at same dir config

boypt · Jan 11, 2020 · e3cde61 · e3cde61
1 parent 8403fb0
commit e3cde61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/engine/config.go b/engine/config.go
@@ -56,6 +56,7 @@ func InitConf(specPath string) (*Config, error) {
 	viper.AddConfigPath("/etc/cloud-torrent/")
 	viper.AddConfigPath("/etc/")
 	viper.AddConfigPath("$HOME/.cloud-torrent")
+	viper.AddConfigPath(".")
 
 	viper.SetDefault("DownloadDirectory", "./downloads")
 	viper.SetDefault("WatchDirectory", "./torrents")
@@ -77,6 +78,7 @@ func InitConf(specPath string) (*Config, error) {
 	configExists := true
 	if err := viper.ReadInConfig(); err != nil {
 		if strings.Contains(err.Error(), "Not Found") {
+			log.Println("[viper Config]", err)
 			configExists = false
 			if specPath == "" {
 				specPath = "./cloud-torrent.yaml"
@@ -105,7 +107,7 @@ func InitConf(specPath string) (*Config, error) {
 		if err := viper.WriteConfig(); err != nil {
 			return nil, err
 		}
-		log.Println("[config] config file written: ", cf)
+		log.Println("[config] config file written: ", cf, "exists:", configExists, "dirchanged", dirChanged)
 	}
 
 	return c, nil

diff --git a/server/server.go b/server/server.go
@@ -175,6 +175,7 @@ func (s *Server) Run(version string) error {
 
 	if s.Debug {
 		viper.Debug()
+		log.Printf("Effective Config: %#v", s.state.Config)
 	}
 
 	s.backgroundRoutines()

diff --git a/server/server_search.go b/server/server_search.go
@@ -15,6 +15,7 @@ func (s *Server) fetchSearchConfig(confurl string) error {
 	log.Println("fetchSearchConfig: loading search config from", confurl)
 	resp, err := http.Get(confurl)
 	if err != nil {
+		log.Println("[fetchSearchConfig]", err)
 		return err
 	}
 	defer resp.Body.Close()