Commit 81c7e8fe authored by alexstocks's avatar alexstocks

fix bugs

parent fcc07cef
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
) )
import ( import (
"github.com/AlexStocks/gocolor" // "github.com/AlexStocks/gocolor"
log "github.com/AlexStocks/log4go" log "github.com/AlexStocks/log4go"
config "github.com/koding/multiconfig" config "github.com/koding/multiconfig"
) )
...@@ -136,8 +136,7 @@ func initConf() { ...@@ -136,8 +136,7 @@ func initConf() {
panic(fmt.Sprintf("time.ParseDuration(WaitTimeout{%#v}) = error{%v}", conf.GettySessionParam.WaitTimeout, err)) panic(fmt.Sprintf("time.ParseDuration(WaitTimeout{%#v}) = error{%v}", conf.GettySessionParam.WaitTimeout, err))
return return
} }
// gocolor.Info("config{%#v}\n", conf)
gocolor.Info("config{%#v}\n", conf)
// log // log
confFile = os.Getenv(APP_LOG_CONF_FILE) confFile = os.Getenv(APP_LOG_CONF_FILE)
...@@ -150,6 +149,7 @@ func initConf() { ...@@ -150,6 +149,7 @@ func initConf() {
return return
} }
log.LoadConfiguration(confFile) log.LoadConfiguration(confFile)
log.Info("config{%#v}", conf)
return return
} }
...@@ -156,7 +156,7 @@ func test() { ...@@ -156,7 +156,7 @@ func test() {
if client.isAvailable() { if client.isAvailable() {
break break
} }
time.Sleep(1e9) time.Sleep(1e6)
} }
var ( var (
......
...@@ -38,7 +38,7 @@ FailFastTimeout = "3s" ...@@ -38,7 +38,7 @@ FailFastTimeout = "3s"
TcpWBufSize = 65536 TcpWBufSize = 65536
PkgRQSize = 512 PkgRQSize = 512
PkgWQSize = 256 PkgWQSize = 256
TcpReadTimeout = 1e9 TcpReadTimeout = "1s"
TcpWriteTimeout = 5e9 TcpWriteTimeout = "5s"
WaitTimeout = 1e9 // 1s WaitTimeout = "1s"
SessionName = "echo-client" SessionName = "echo-client"
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
) )
import ( import (
"github.com/AlexStocks/gocolor" // "github.com/AlexStocks/gocolor"
log "github.com/AlexStocks/log4go" log "github.com/AlexStocks/log4go"
config "github.com/koding/multiconfig" config "github.com/koding/multiconfig"
) )
...@@ -112,8 +112,7 @@ func initConf() { ...@@ -112,8 +112,7 @@ func initConf() {
panic(fmt.Sprintf("time.ParseDuration(WaitTimeout{%#v}) = error{%v}", conf.GettySessionParam.WaitTimeout, err)) panic(fmt.Sprintf("time.ParseDuration(WaitTimeout{%#v}) = error{%v}", conf.GettySessionParam.WaitTimeout, err))
return return
} }
// gocolor.Info("config{%#v}\n", conf)
gocolor.Info("config{%#v}\n", conf)
// log // log
confFile = os.Getenv(APP_LOG_CONF_FILE) confFile = os.Getenv(APP_LOG_CONF_FILE)
...@@ -126,6 +125,7 @@ func initConf() { ...@@ -126,6 +125,7 @@ func initConf() {
return return
} }
log.LoadConfiguration(confFile) log.LoadConfiguration(confFile)
log.Info("config{%#v}", conf)
return return
} }
...@@ -22,7 +22,7 @@ FailFastTimeout = "3s" ...@@ -22,7 +22,7 @@ FailFastTimeout = "3s"
TcpWBufSize = 524288 TcpWBufSize = 524288
PkgRQSize = 1024 PkgRQSize = 1024
PkgWQSize = 512 PkgWQSize = 512
TcpReadTimeout = 1e9 TcpReadTimeout = "1s"
TcpWriteTimeout = 5e9 TcpWriteTimeout = "5s"
WaitTimeout = 1e9 // 1s WaitTimeout = "1s"
SessionName = "echo-server" SessionName = "echo-server"
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