From e6d76a79ae280993472a8d151d6e839f980d54b2 Mon Sep 17 00:00:00 2001
From: lwch <lwch748@gmail.com>
Date: Thu, 26 Aug 2021 15:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8F=A1=E6=89=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=85=E4=B8=AD=E7=9A=84from=5Fidx=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/client/pool/conn.go | 6 +-----
 code/client/pool/pool.go | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

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
 }