diff --git a/README.md b/README.md index dc88e49..7751312 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ You can get runnable program in the releases of this repository, which supports ![](https://i.loli.net/2021/05/15/oQM1yZ6pWm3AIEj.png) -You could use redis-cli or other redis client to connect godis server, which listens on 127.0.0.1:6379 on default mode. +You could use redis-cli or other redis client to connect godis server, which listens on 0.0.0.0:6399 on default mode. ![](https://i.loli.net/2021/05/15/7WquEgonzY62sZI.png) diff --git a/README_CN.md b/README_CN.md index 2524ede..e46079d 100644 --- a/README_CN.md +++ b/README_CN.md @@ -27,7 +27,7 @@ Godis 的信息。 ![](https://i.loli.net/2021/05/15/oQM1yZ6pWm3AIEj.png) -godis 默认监听 127.0.0.1:6379,可以使用 redis-cli 或者其它 redis 客户端连接 Godis 服务器。 +godis 默认监听 0.0.0.0:6399,可以使用 redis-cli 或者其它 redis 客户端连接 Godis 服务器。 ![](https://i.loli.net/2021/05/15/7WquEgonzY62sZI.png) diff --git a/build-all.sh b/build-all.sh new file mode 100644 index 0000000..5290165 --- /dev/null +++ b/build-all.sh @@ -0,0 +1,2 @@ +./build-darwin.sh +./build-linux.sh \ No newline at end of file diff --git a/build.sh b/build-darwin.sh similarity index 100% rename from build.sh rename to build-darwin.sh diff --git a/cmd/main.go b/cmd/main.go index 3e481b7..2a6d581 100644 --- a/cmd/main.go +++ b/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),