github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

runtime: do not check for EOF error in console watcher

Browse Source 
The documentation of the bufio package explicitly says

"Err returns the first non-EOF error that was encountered by the
Scanner."

When io.EOF happens, `Err()` will return `nil` and `Scan()` will return
`false`.

Fixes #4079

Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
This commit is contained in:
Rafael Fonseca 2022-05-17 15:08:36 +02:00
parent 5d43718494
commit 8052fe62fa
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/runtime/virtcontainers/sandbox.go
View File

@ -1037,15 +1037,13 @@ func (cw *consoleWatcher) start(s *Sandbox) (err error) {
} }
if err := scanner.Err(); err != nil { if err := scanner.Err(); err != nil {
if err == io.EOF { s.Logger().WithError(err).WithFields(logrus.Fields{
s.Logger().Info("console watcher quits") "console-protocol": cw.proto,
} else { "console-url": cw.consoleURL,
s.Logger().WithError(err).WithFields(logrus.Fields{ "sandbox": s.id,
"console-protocol": cw.proto, }).Error("Failed to read guest console logs")
"console-url": cw.consoleURL, } else { // The error is `nil` in case of io.EOF
"sandbox": s.id, s.Logger().Info("console watcher quits")
}).Error("Failed to read guest console logs")
}
} }
}() }()