Skip to content
Snippets Groups Projects
Commit d2b2e383 authored by Yawning Angel's avatar Yawning Angel
Browse files

Fix copyLoop to break out the other goroutine on graceful exit.

This should fix sockets getting stuck in CLOSE_WAIT.
parent 7a7b2af5
No related branches found
No related tags found
No related merge requests found
......@@ -88,22 +88,22 @@ func copyLoop(a, b net.Conn) {
go func() {
defer logAndRecover()
defer wg.Done()
defer b.Close()
defer a.Close()
_, err := io.Copy(b, a)
if err != nil {
b.Close()
a.Close()
log.Printf("[WARN] Connection closed: %s", err)
}
}()
go func() {
defer logAndRecover()
defer wg.Done()
defer a.Close()
defer b.Close()
_, err := io.Copy(a, b)
if err != nil {
a.Close()
b.Close()
log.Printf("[WARN] Connection closed: %s", err)
}
}()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment