Skip to content

G
gost
Commit a22d93fb authored by rui.zheng's avatar rui.zheng
Browse files
Options

fix log

parent acd3f73a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
cmd/gost/main.go
View file @ a22d93fb
...@@ -29,6 +29,8 @@ var ( ...@@ -29,6 +29,8 @@ var (
) )
func init() { func init() {
gost.SetLogger(&gost.LogLogger{})
var ( var (
configureFile string configureFile string
printVersion bool printVersion bool
...@@ -56,7 +58,6 @@ func init() { ...@@ -56,7 +58,6 @@ func init() {
os.Exit(0) os.Exit(0)
} }
gost.SetLogger(&gost.LogLogger{})
gost.Debug = options.Debug gost.Debug = options.Debug
} }
...@@ -233,8 +234,11 @@ func serve(chain *gost.Chain) error { ...@@ -233,8 +234,11 @@ func serve(chain *gost.Chain) error {
if node.User != nil { if node.User != nil {
users = append(users, node.User) users = append(users, node.User)
} }
tlsCfg, _ := tlsConfig(node.Values.Get("cert"), node.Values.Get("key")) certFile, keyFile := node.Values.Get("cert"), node.Values.Get("key")
tlsCfg, err := tlsConfig(certFile, keyFile)
if err != nil && certFile != "" && keyFile != "" {
return err
}
var ln gost.Listener var ln gost.Listener
switch node.Transport { switch node.Transport {
case "tls": case "tls":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment