Merge pull request #136 from dmcgowan/backport-reset-leak

server.go

@@ -24,6 +24,7 @@ import (
  "net"
  "sync"
  "sync/atomic"
+ "syscall"
  "time"
 
  "github.com/sirupsen/logrus"
@@ -467,14 +468,12 @@ func (c *serverConn) run(sctx context.Context) {
  // branch. Basically, it means that we are no longer receiving
  // requests due to a terminal error.
  recvErr = nil // connection is now "closing"
- if err == io.EOF || err == io.ErrUnexpectedEOF {
+ if err == io.EOF || err == io.ErrUnexpectedEOF || errors.Is(err, syscall.ECONNRESET) {
  // The client went away and we should stop processing
  // requests, so that the client connection is closed
  return
  }
- if err != nil {
- logrus.WithError(err).Error("error receiving message")
- }
+ logrus.WithError(err).Error("error receiving message")
  case <-shutdown:
  return
  }