Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed ClosedChannel errors on exit #173

Merged
merged 1 commit into from
Oct 7, 2021
Merged

Removed ClosedChannel errors on exit #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions input/socket/inputsocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package inputsocket
import (
"bufio"
"context"
"errors"
"io"
"net"
"os"
Expand Down Expand Up @@ -30,7 +31,7 @@ type InputConfig struct {
// For Unix networks, the address must be a file system path.
Address string `json:"address"`
ReusePort bool `json:"reuseport"`
BufferSize int `json:"buffer_size"`
BufferSize int `json:"buffer_size" yaml:"buffer_size"`
// packetmode is only valid for UDP sessions and handles each packet as a message on its own
PacketMode bool `json:"packetmode"`
}
Expand Down Expand Up @@ -143,6 +144,9 @@ func (i *InputConfig) Start(ctx context.Context, msgChan chan<- logevent.LogEven
for {
conn, err := l.Accept()
if err != nil {
if errors.Is(err, net.ErrClosed) {
return nil
}
return ErrorSocketAccept.New(err)
}
doneCh := make(chan struct{})
Expand Down Expand Up @@ -214,6 +218,9 @@ func (i *InputConfig) handleUDPpacketMode(ctx context.Context, conn net.PacketCo
case io.EOF:
return nil
default:
if errors.Is(err, net.ErrClosed) {
return nil // do not return error on closed socket
}
return err
}
}
Expand Down Expand Up @@ -243,12 +250,14 @@ func (i *InputConfig) handleUDP(ctx context.Context, conn net.PacketConn, msgCha
default:
}
n, _, err := conn.ReadFrom(b)
if err == io.EOF {
if n > 0 {
pw.Write(b[:n])
}
if errors.Is(err, net.ErrClosed) || err == io.EOF {
break
} else if err != nil {
return err
}
pw.Write(b[:n])
}
return nil
})
Expand Down