Merge pull request #40 from CovenantSQL/master

Expose Stream.die via Stream.GetDieCh for canceling running golang RPC func

session_test.go

@@ -86,6 +86,23 @@ func TestEcho(t *testing.T) {
 	session.Close()
 }
 
+func TestGetDieCh(t *testing.T) {
+	cs, ss, err := getSmuxStreamPair()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer ss.Close()
+	dieCh := ss.GetDieCh()
+	go func() {
+		select {
+		case <-dieCh:
+		case <-time.Tick(time.Second):
+			t.Fatal("wait die chan timeout")
+		}
+	}()
+	cs.Close()
+}
+
 func TestSpeed(t *testing.T) {
 	_, stop, cli, err := setupServer(t)
 	if err != nil {

stream.go

@@ -146,6 +146,12 @@ func (s *Stream) Close() error {
 	}
 }
 
+// GetDieCh returns a readonly chan which can be readable
+// when the stream is to be closed.
+func (s *Stream) GetDieCh() <-chan struct{} {
+	return s.die
+}
+
 // SetReadDeadline sets the read deadline as defined by
 // net.Conn.SetReadDeadline.
 // A zero time value disables the deadline.