From f756d62b19941e5c1fadc5cdabf289b56008563b Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Tue, 13 Mar 2018 17:14:25 +0800 Subject: [PATCH] Signed-off-by: arraykeys@gmail.com --- services/mux_server.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/services/mux_server.go b/services/mux_server.go index 413b216..2bba64a 100644 --- a/services/mux_server.go +++ b/services/mux_server.go @@ -266,14 +266,6 @@ func (s *MuxServer) GetConn(index string) (conn net.Conn, err error) { } s.sessions.Set(index, session) log.Printf("session[%s] created", index) - } else { - session = _session.(*smux.Session) - } - conn, err = session.OpenStream() - if err != nil { - session.Close() - s.sessions.Remove(index) - } else { go func() { for { if session.IsClosed() { @@ -283,8 +275,14 @@ func (s *MuxServer) GetConn(index string) (conn net.Conn, err error) { time.Sleep(time.Second * 5) } }() + } else { + session = _session.(*smux.Session) + } + conn, err = session.OpenStream() + if err != nil { + session.Close() + s.sessions.Remove(index) } - return } func (s *MuxServer) getParentConn() (conn net.Conn, err error) {