mirror of
				https://github.com/HDT3213/godis.git
				synced 2025-10-31 03:56:22 +08:00 
			
		
		
		
	bug fix: default config
This commit is contained in:
		
							
								
								
									
										38
									
								
								cmd/main.go
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								cmd/main.go
									
									
									
									
									
								
							| @@ -1,7 +1,6 @@ | ||||
| package main | ||||
|  | ||||
| import ( | ||||
| 	_ "embed" | ||||
| 	"fmt" | ||||
| 	"github.com/hdt3213/godis/config" | ||||
| 	"github.com/hdt3213/godis/lib/logger" | ||||
| @@ -10,22 +9,45 @@ import ( | ||||
| 	"os" | ||||
| ) | ||||
|  | ||||
| //go:embed banner.txt | ||||
| var banner string | ||||
| var banner = ` | ||||
|    ______          ___ | ||||
|   / ____/___  ____/ (_)____ | ||||
|  / / __/ __ \/ __  / / ___/ | ||||
| / /_/ / /_/ / /_/ / (__  ) | ||||
| \____/\____/\__,_/_/____/ | ||||
| ` | ||||
|  | ||||
| var defaultProperties = &config.ServerProperties{ | ||||
| 	Bind:           "0.0.0.0", | ||||
| 	Port:           6399, | ||||
| 	AppendOnly:     false, | ||||
| 	AppendFilename: "", | ||||
| 	MaxClients:     1000, | ||||
| } | ||||
|  | ||||
| func fileExists(filename string) bool { | ||||
| 	info, err := os.Stat(filename) | ||||
| 	return err != nil && !info.IsDir() | ||||
| } | ||||
|  | ||||
| func main() { | ||||
| 	print(banner) | ||||
| 	configFilename := os.Getenv("CONFIG") | ||||
| 	if configFilename == "" { | ||||
| 		configFilename = "redis.conf" | ||||
| 	} | ||||
| 	config.SetupConfig(configFilename) | ||||
| 	logger.Setup(&logger.Settings{ | ||||
| 		Path:       "logs", | ||||
| 		Name:       "godis", | ||||
| 		Ext:        ".log", | ||||
| 		TimeFormat: "2006-01-02", | ||||
| 	}) | ||||
| 	configFilename := os.Getenv("CONFIG") | ||||
| 	if configFilename == "" { | ||||
| 		if fileExists("redis.conf") { | ||||
| 			config.SetupConfig("redis.conf") | ||||
| 		} else { | ||||
| 			config.Properties = defaultProperties | ||||
| 		} | ||||
| 	} else { | ||||
| 		config.SetupConfig(configFilename) | ||||
| 	} | ||||
|  | ||||
| 	err := tcp.ListenAndServeWithSignal(&tcp.Config{ | ||||
| 		Address: fmt.Sprintf("%s:%d", config.Properties.Bind, config.Properties.Port), | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 hdt3213
					hdt3213