Browse Source

Prevent double waitgroup decrement (#10170) (#10175)

* Prevent double waitgroup decrement

Co-authored-by: zeripath <art27@cantab.net>
tags/v1.11.0
guillep2k 4 years ago
parent
commit
6af58022c8
No account linked to committer's email address
1 changed files with 7 additions and 3 deletions
  1. 7
    3
      modules/graceful/server.go

+ 7
- 3
modules/graceful/server.go View File

@@ -12,6 +12,7 @@ import (
"os"
"strings"
"sync"
"sync/atomic"
"syscall"
"time"

@@ -215,9 +216,12 @@ func (wl *wrappedListener) Accept() (net.Conn, error) {
}
}

closed := int32(0)

c = wrappedConn{
Conn: c,
server: wl.server,
closed: &closed,
}

wl.server.wg.Add(1)
@@ -241,12 +245,12 @@ func (wl *wrappedListener) File() (*os.File, error) {
type wrappedConn struct {
net.Conn
server *Server
closed *int32
}

func (w wrappedConn) Close() error {
err := w.Conn.Close()
if err == nil {
if atomic.CompareAndSwapInt32(w.closed, 0, 1) {
w.server.wg.Done()
}
return err
return w.Conn.Close()
}

Loading…
Cancel
Save