add keep alive period & write pkg timeout

echo/tcp-echo/change_log.md

@@ -10,6 +10,15 @@
 ## develop history ##
 ---
 
+- 2018/03/14
+    > improvement
+    * add keep alive period
+    * add write package timeout
+
+- 2018/03/10
+    > improvement
+    * use getty 0.8.1
+
 - 2016/11/19
     > 1 add client/app/config.go:GettySessionParam{CompressEncoding} to test compress websocket compression extension.
     >

echo/tcp-echo/client/app/client.go

@@ -155,7 +155,7 @@ func (this *EchoClient) heartbeat(session getty.Session) {
 	pkg.B = echoHeartbeatRequestString
 	pkg.H.Len = (uint16)(len(pkg.B) + 1)
 
-	if err := session.WritePkg(&pkg); err != nil {
+	if err := session.WritePkg(&pkg, WritePkgTimeout); err != nil {
 		log.Warn("session.WritePkg(session{%s}, pkg{%s}) = error{%v}", session.Stat(), pkg, err)
 		session.Close()
 

echo/tcp-echo/client/app/config.go

@@ -35,6 +35,8 @@ type (
 		CompressEncoding bool   `default:"false"`
 		TcpNoDelay       bool   `default:"true"`
 		TcpKeepAlive     bool   `default:"true"`
+		KeepAlivePeriod  string `default:"180s"`
+		keepAlivePeriod  time.Duration
 		TcpRBufSize      int    `default:"262144"`
 		TcpWBufSize      int    `default:"65536"`
 		PkgRQSize        int    `default:"1024"`
@@ -123,6 +125,11 @@ func initConf() {
 		panic(fmt.Sprintf("time.ParseDuration(FailFastTimeout{%#v}) = error{%v}", conf.FailFastTimeout, err))
 		return
 	}
+	conf.GettySessionParam.keepAlivePeriod, err = time.ParseDuration(conf.GettySessionParam.KeepAlivePeriod)
+	if err != nil {
+		panic(fmt.Sprintf("time.ParseDuration(KeepAlivePeriod{%#v}) = error{%v}", conf.GettySessionParam.KeepAlivePeriod, err))
+		return
+	}
 	conf.GettySessionParam.tcpReadTimeout, err = time.ParseDuration(conf.GettySessionParam.TcpReadTimeout)
 	if err != nil {
 		panic(fmt.Sprintf("time.ParseDuration(TcpReadTimeout{%#v}) = error{%v}", conf.GettySessionParam.TcpReadTimeout, err))

echo/tcp-echo/client/app/main.go

@@ -35,6 +35,10 @@ const (
 	pprofPath = "/debug/pprof/"
 )
 
+const (
+	WritePkgTimeout = 1e8
+)
+
 var (
 	client EchoClient
 )
@@ -85,6 +89,9 @@ func newSession(session getty.Session) error {
 
 	tcpConn.SetNoDelay(conf.GettySessionParam.TcpNoDelay)
 	tcpConn.SetKeepAlive(conf.GettySessionParam.TcpKeepAlive)
+	if conf.GettySessionParam.TcpKeepAlive {
+		tcpConn.SetKeepAlivePeriod(conf.GettySessionParam.keepAlivePeriod)
+	}
 	tcpConn.SetReadBuffer(conf.GettySessionParam.TcpRBufSize)
 	tcpConn.SetWriteBuffer(conf.GettySessionParam.TcpWBufSize)
 
@@ -155,7 +162,7 @@ func echo() {
 	pkg.H.Len = (uint16)(len(pkg.B)) + 1
 
 	if session := client.selectSession(); session != nil {
-		err := session.WritePkg(&pkg)
+		err := session.WritePkg(&pkg, WritePkgTimeout)
 		if err != nil {
 			log.Warn("session.WritePkg(session{%s}, pkg{%s}) = error{%v}", session.Stat(), pkg, err)
 			session.Close()

echo/tcp-echo/client/profiles/test/config.toml

@@ -38,6 +38,7 @@ FailFastTimeout         = "3s"
     CompressEncoding    = true
     TcpNoDelay          = true
     TcpKeepAlive        = true
+    KeepAlivePeriod     = "120s"
     TcpRBufSize         = 262144
     TcpWBufSize         = 65536
     PkgRQSize           = 512

echo/tcp-echo/client/profiles/test/log.xml

 <logging>
-  <filter enabled="false">
+  <filter enabled="true">
     <tag>stdout</tag>
     <type>console</type>
     <!-- level is (:?FINEST|FINE|DEBUG|TRACE|INFO|WARNING|ERROR) -->

echo/tcp-echo/server/app/config.go

@@ -35,6 +35,8 @@ type (
 		CompressEncoding bool   `default:"false"`
 		TcpNoDelay       bool   `default:"true"`
 		TcpKeepAlive     bool   `default:"true"`
+		KeepAlivePeriod  string `default:"180s"`
+		keepAlivePeriod  time.Duration
 		TcpRBufSize      int    `default:"262144"`
 		TcpWBufSize      int    `default:"65536"`
 		PkgRQSize        int    `default:"1024"`
@@ -88,6 +90,7 @@ func initConf() {
 	}
 	conf = new(Config)
 	config.MustLoadWithPath(confFile, conf)
+
 	conf.sessionTimeout, err = time.ParseDuration(conf.SessionTimeout)
 	if err != nil {
 		panic(fmt.Sprintf("time.ParseDuration(SessionTimeout{%#v}) = error{%v}", conf.SessionTimeout, err))
@@ -98,6 +101,11 @@ func initConf() {
 		panic(fmt.Sprintf("time.ParseDuration(FailFastTimeout{%#v}) = error{%v}", conf.FailFastTimeout, err))
 		return
 	}
+	conf.GettySessionParam.keepAlivePeriod, err = time.ParseDuration(conf.GettySessionParam.KeepAlivePeriod)
+	if err != nil {
+		panic(fmt.Sprintf("time.ParseDuration(KeepAlivePeriod{%#v}) = error{%v}", conf.GettySessionParam.KeepAlivePeriod, err))
+		return
+	}
 	conf.GettySessionParam.tcpReadTimeout, err = time.ParseDuration(conf.GettySessionParam.TcpReadTimeout)
 	if err != nil {
 		panic(fmt.Sprintf("time.ParseDuration(TcpReadTimeout{%#v}) = error{%v}", conf.GettySessionParam.TcpReadTimeout, err))

echo/tcp-echo/server/app/handler.go

@@ -20,6 +20,10 @@ import (
 	log "github.com/AlexStocks/log4go"
 )
 
+const (
+	WritePkgTimeout = 1e8
+)
+
 var (
 	errTooManySessions = errors.New("Too many echo sessions!")
 )
@@ -42,7 +46,7 @@ func (this *HeartbeatHandler) Handle(session getty.Session, pkg *EchoPackage) er
 	rspPkg.B = echoHeartbeatResponseString
 	rspPkg.H.Len = uint16(len(rspPkg.B) + 1)
 
-	return session.WritePkg(&rspPkg)
+	return session.WritePkg(&rspPkg, WritePkgTimeout)
 }
 
 ////////////////////////////////////////////
@@ -53,7 +57,7 @@ type MessageHandler struct{}
 
 func (this *MessageHandler) Handle(session getty.Session, pkg *EchoPackage) error {
 	log.Debug("get echo package{%s}", pkg)
-	return session.WritePkg(pkg)
+	return session.WritePkg(pkg, WritePkgTimeout)
 }
 
 ////////////////////////////////////////////

echo/tcp-echo/server/app/server.go

@@ -27,6 +27,7 @@ import (
 	"github.com/AlexStocks/goext/log"
 	"github.com/AlexStocks/goext/net"
 	log "github.com/AlexStocks/log4go"
+	"github.com/pingcap/tidb/ast"
 )
 
 const (
@@ -90,6 +91,9 @@ func newSession(session getty.Session) error {
 
 	tcpConn.SetNoDelay(conf.GettySessionParam.TcpNoDelay)
 	tcpConn.SetKeepAlive(conf.GettySessionParam.TcpKeepAlive)
+	if conf.GettySessionParam.TcpKeepAlive {
+		tcpConn.SetKeepAlivePeriod(conf.GettySessionParam.keepAlivePeriod)
+	}
 	tcpConn.SetReadBuffer(conf.GettySessionParam.TcpRBufSize)
 	tcpConn.SetWriteBuffer(conf.GettySessionParam.TcpWBufSize)
 

echo/tcp-echo/server/profiles/test/config.toml

@@ -22,6 +22,7 @@ FailFastTimeout         = "3s"
     CompressEncoding    = true
     TcpNoDelay          = true
     TcpKeepAlive        = true
+    KeepAlivePeriod     = "120s"
     TcpRBufSize         = 262144
     TcpWBufSize         = 524288
     PkgRQSize           = 1024

echo/tcp-echo/server/profiles/test/log.xml

 <logging>
-  <filter enabled="false">
+  <filter enabled="true">
     <tag>stdout</tag>
     <type>console</type>
     <!-- level is (:?FINEST|FINE|DEBUG|TRACE|INFO|WARNING|ERROR) -->