Merge pull request #89 from anthonyraymond/patch-1

Increase readTimeout tolerance according to RFC

server/client/conn.go

@@ -122,7 +122,7 @@ func (c *Conn) readLoop() {
 			// infinite timeout
 			c.rw.SetReadDeadline(time.Time{})
 		} else {
-			c.rw.SetReadDeadline(time.Now().Add(readTimeout))
+			c.rw.SetReadDeadline(time.Now().Add(readTimeout * 2))
 		}
 		f, err := reader.Read()
 		if err != nil {

server/server_test.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"runtime"
 	"testing"
+	"time"
 
 	"github.com/go-stomp/stomp"
 	. "gopkg.in/check.v1"
@@ -45,6 +46,37 @@ func (s *ServerSuite) TestConnectAndDisconnect(c *C) {
 	conn.Close()
 }
 
+
+func (s *ServerSuite) TestHeartBeatingTolerance(c *C) {
+	// Heart beat should not close connection exactly after not receiving message after cx
+	//  it should add a pretty decent amount of time to counter network delay of other timing issues
+	addr := ":59092"
+	l, err := net.Listen("tcp", addr)
+	c.Assert(err, IsNil)
+	defer func() { l.Close() }()
+	serv := Server{
+		Addr:          "",
+		Authenticator: nil,
+		QueueStorage:  nil,
+		HeartBeat:     5 * time.Millisecond,
+	}
+	go serv.Serve(l)
+
+	conn, err := net.Dial("tcp", "127.0.0.1"+addr)
+	c.Assert(err, IsNil)
+	defer conn.Close()
+
+	client, err := stomp.Connect(conn, stomp.ConnOpt.HeartBeat(5 * time.Millisecond, 5 * time.Millisecond))
+	c.Assert(err, IsNil)
+	defer client.Disconnect()
+
+	time.Sleep(serv.HeartBeat * 50) // let it go for some time to allow client and server to exchange some heart beat
+
+	// Ensure the server has not closed his readChannel
+	err = client.Send("/topic/whatever", "text/plain", []byte("hello"))
+	c.Assert(err, IsNil)
+}
+
 func (s *ServerSuite) TestSendToQueuesAndTopics(c *C) {
 	ch := make(chan bool, 2)
 	println("number cpus:", runtime.NumCPU())