github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

logread should not panic on an EOF, instead exiting gracefully

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2023-06-19 17:50:35 +03:00
parent 7164b2c04d
commit b7002c0eb2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/memlogd/cmd/logread/main.go
View File

@ -2,8 +2,10 @@ package main
import ( import (
"encoding/json" "encoding/json"
"errors"
"flag" "flag"
"fmt" "fmt"
"io"
"net" "net"
"strings" "strings"
"time" "time"
@ -65,6 +67,9 @@ func main() {
decoder := json.NewDecoder(conn) decoder := json.NewDecoder(conn)
for { for {
if err := decoder.Decode(&entry); err != nil { if err := decoder.Decode(&entry); err != nil {
if errors.Is(err, net.ErrClosed) || errors.Is(err, io.EOF) {
return
}
panic(err) panic(err)
} }