From b7002c0eb2ac75a3c069779d0b473abe0e42a915 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 19 Jun 2023 17:50:35 +0300 Subject: [PATCH] logread should not panic on an EOF, instead exiting gracefully Signed-off-by: Avi Deitcher --- pkg/memlogd/cmd/logread/main.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/memlogd/cmd/logread/main.go b/pkg/memlogd/cmd/logread/main.go index ff1d2ee90..8eab0e3ec 100644 --- a/pkg/memlogd/cmd/logread/main.go +++ b/pkg/memlogd/cmd/logread/main.go @@ -2,8 +2,10 @@ package main import ( "encoding/json" + "errors" "flag" "fmt" + "io" "net" "strings" "time" @@ -65,6 +67,9 @@ func main() { decoder := json.NewDecoder(conn) for { if err := decoder.Decode(&entry); err != nil { + if errors.Is(err, net.ErrClosed) || errors.Is(err, io.EOF) { + return + } panic(err) }