opt: refine the way to call loadBalancer.calibrate

panjf2000 · Aug 12, 2020 · 9ab678b · 9ab678b
1 parent 8c520a2
commit 9ab678b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/acceptor_unix.go b/acceptor_unix.go
@@ -46,7 +46,6 @@ func (svr *server) acceptNewConnection(fd int) error {
 			return
 		}
 		el.connections[nfd] = c
-		el.calibrateCallback(el, 1)
 		err = el.loopOpen(c)
 		return
 	})

diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -93,7 +93,6 @@ func (el *eventloop) loopAccept(fd int) error {
 		c := newTCPConn(nfd, el, sa)
 		if err = el.poller.AddRead(c.fd); err == nil {
 			el.connections[c.fd] = c
-			el.calibrateCallback(el, 1)
 			return el.loopOpen(c)
 		}
 		return err
@@ -111,6 +110,7 @@ func (el *eventloop) loopOpen(c *conn) error {
 			_ = netpoll.SetKeepAlive(c.fd, int(el.svr.opts.TCPKeepAlive/time.Second))
 		}
 	}
+	el.calibrateCallback(el, 1)
 
 	out, action := el.eventHandler.OnOpened(c)
 	if out != nil {

diff --git a/eventloop_windows.go b/eventloop_windows.go
@@ -84,13 +84,13 @@ func (el *eventloop) loopAccept(c *stdConn) error {
 	el.connections[c] = struct{}{}
 	c.localAddr = el.svr.ln.lnaddr
 	c.remoteAddr = c.conn.RemoteAddr()
-	el.calibrateCallback(el, 1)
 	if el.svr.opts.TCPKeepAlive > 0 {
 		if c, ok := c.conn.(*net.TCPConn); ok {
 			_ = c.SetKeepAlive(true)
 			_ = c.SetKeepAlivePeriod(el.svr.opts.TCPKeepAlive)
 		}
 	}
+	el.calibrateCallback(el, 1)
 
 	out, action := el.eventHandler.OnOpened(c)
 	if out != nil {