mirror of
				https://github.com/terorie/od-database-crawler.git
				synced 2025-11-03 22:26:52 +00:00 
			
		
		
		
	Fix --config flag
This commit is contained in:
		
							parent
							
								
									120c026983
								
							
						
					
					
						commit
						0ca6deede8
					
				
							
								
								
									
										21
									
								
								config.go
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								config.go
									
									
									
									
									
								
							@ -7,7 +7,6 @@ import (
 | 
				
			|||||||
	"github.com/spf13/viper"
 | 
						"github.com/spf13/viper"
 | 
				
			||||||
	"io"
 | 
						"io"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
	"path/filepath"
 | 
					 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@ -135,17 +134,23 @@ func prepareConfig() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
func readConfig() {
 | 
					func readConfig() {
 | 
				
			||||||
	// If config.yml in working dir, use it
 | 
						// If config.yml in working dir, use it
 | 
				
			||||||
	if _, err := os.Stat("config.yml"); err == nil {
 | 
						if configFile == "" {
 | 
				
			||||||
		configFile = "config.yml"
 | 
							_, err := os.Stat("config.yml")
 | 
				
			||||||
 | 
							if err == nil {
 | 
				
			||||||
 | 
								configFile = "config.yml"
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if configFile != "" {
 | 
						if configFile != "" {
 | 
				
			||||||
		var err error
 | 
							confF, err := os.Open(configFile)
 | 
				
			||||||
		confPath, err := filepath.Abs(configFile)
 | 
							if err != nil {
 | 
				
			||||||
		if err != nil { panic(err) }
 | 
								fmt.Fprintln(os.Stderr, err)
 | 
				
			||||||
 | 
								os.Exit(1)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							defer confF.Close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		viper.SetConfigFile(confPath)
 | 
							viper.SetConfigType("yml")
 | 
				
			||||||
		err = viper.ReadInConfig()
 | 
							err = viper.ReadConfig(confF)
 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
			fmt.Fprintln(os.Stderr, err)
 | 
								fmt.Fprintln(os.Stderr, err)
 | 
				
			||||||
			os.Exit(1)
 | 
								os.Exit(1)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user