Skip to content

Commit

Permalink
bug fix: default config
Browse files Browse the repository at this point in the history
  • Loading branch information
HDT3213 committed May 17, 2021
1 parent 0111355 commit 1ca15f8
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions build-all.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./build-darwin.sh
./build-linux.sh
File renamed without changes.
38 changes: 30 additions & 8 deletions cmd/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
_ "embed"
"fmt"
"github.com/hdt3213/godis/config"
"github.com/hdt3213/godis/lib/logger"
Expand All @@ -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),
Expand Down

0 comments on commit 1ca15f8

Please sign in to comment.