mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 20:22:14 +02:00
Prevent double waitgroup decrement (#10170)
* Prevent double waitgroup decrement
This commit is contained in:
parent
d32b65ab68
commit
c512bfd09c
1 changed files with 7 additions and 3 deletions
|
@ -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…
Reference in a new issue