github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-14 22:24:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4271 from r4f4/runtime-err-check-fix

Browse Source 
runtime: do not check for EOF error in console watcher
This commit is contained in:
Fabiano Fidêncio 2022-05-18 09:49:48 +02:00 committed by GitHub
commit c88a48be21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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")
}
} }
}() }()