diff --git a/code/client/pool/conn.go b/code/client/pool/conn.go index 4f073bf..6184526 100644 --- a/code/client/pool/conn.go +++ b/code/client/pool/conn.go @@ -126,10 +126,6 @@ func (conn *Conn) loopRead(cancel context.CancelFunc) { } } -func loopWrite(conn *network.Conn, msg *network.Msg, timeout time.Duration) error { - return conn.WriteMessage(msg, timeout) -} - func (conn *Conn) loopWrite(cancel context.CancelFunc) { defer conn.Close() defer cancel() @@ -140,7 +136,7 @@ func (conn *Conn) loopWrite(cancel context.CancelFunc) { } msg.From = conn.parent.cfg.ID msg.FromIdx = conn.Idx - err := loopWrite(conn.conn, msg, conn.parent.cfg.WriteTimeout) + err := conn.conn.WriteMessage(msg, conn.parent.cfg.WriteTimeout) if err != nil { logging.Error("write message error on %s-%d: %v", conn.parent.cfg.ID, conn.Idx, err) diff --git a/code/client/pool/pool.go b/code/client/pool/pool.go index fb0c99a..2334403 100644 --- a/code/client/pool/pool.go +++ b/code/client/pool/pool.go @@ -58,6 +58,7 @@ func (p *Pool) Get(id ...string) *Conn { return conn } + p.idx++ conn := p.connect(p.idx) if conn == nil { return nil @@ -66,7 +67,6 @@ func (p *Pool) Get(id ...string) *Conn { p.Lock() p.conns[c.Idx] = c - p.idx++ p.Unlock() return c }