Merge pull request #1 from couchbaselabs/master

Fixed a couple of goroutine leaks.

sockjs/conn-utils.go

@@ -27,6 +27,9 @@ func hijack(rw http.ResponseWriter) (conn net.Conn, err error) {
 func connectionClosedGuard(conn net.Conn, conn_interrupted chan<- bool) {
 	_, err := conn.Read([]byte{1})
 	if err != nil {
-		conn_interrupted <- true
+		select {
+		case conn_interrupted <- true:
+		default:
+		}
 	}
 }

sockjs/handler.go

@@ -115,11 +115,11 @@ func activeConnectionState(c *conn) connectionStateFn {
 		}()
 
 		// start protocol handling
-		conn_closed := make(chan bool)
+		conn_closed := make(chan bool, 1)
 		defer func() { conn_closed <- true }()
 		go c.activeConnectionGuard(conn_closed)
 
-		conn_interrupted := make(chan bool)
+		conn_interrupted := make(chan bool, 1)
 		go connectionClosedGuard(conn, conn_interrupted)
 
 		bytes_sent := 0

sockjs/types.go

@@ -7,6 +7,7 @@ Cotains package internal types (not public)
 import (
 	"errors"
 	"io"
+	"time"
 )
 
 // Error variable
@@ -22,14 +23,16 @@ type conn struct {
 	context
 	input_channel    chan []byte
 	output_channel   chan []byte
+	timeout          time.Duration
 	httpTransactions chan *httpTransaction
 }
 
 func newConn(ctx *context) *conn {
 	return &conn{
 		input_channel:    make(chan []byte),
-		output_channel:   make(chan []byte),
+		output_channel:   make(chan []byte, 64),
 		httpTransactions: make(chan *httpTransaction),
+		timeout:          time.Second * 30,
 		context:          *ctx,
 	}
 }
@@ -42,16 +45,13 @@ func (this *conn) ReadMessage() ([]byte, error) {
 }
 
 func (this *conn) WriteMessage(val []byte) (count int, err error) {
-	defer func() {
-		if recover() != nil {
-			err = ErrConnectionClosed
-		}
-	}()
 	val2 := make([]byte, len(val))
 	copy(val2, val)
-	go func() {
-		this.output_channel <- val2
-	}()
+	select {
+	case this.output_channel <- val2:
+	case <-time.After(this.timeout):
+		return 0, ErrConnectionClosed
+	}
 	return len(val), nil
 }