This commit is contained in:
rui.zheng 2017-08-13 22:08:44 +08:00
parent acd3f73aa9
commit a22d93fb88

View File

@ -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() {
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 {
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":