fix: 解决容器日志缺失的问题 (#4549)

This commit is contained in:
ssongliu 2024-04-17 16:52:07 +08:00 committed by GitHub
parent c5bb8dab8c
commit 5cfdcedf9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -657,6 +657,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
}
if !follow {
cmd := exec.Command(commandName, commandArg...)
cmd.Stderr = cmd.Stdout
stdout, _ := cmd.CombinedOutput()
if !utf8.Valid(stdout) {
return errors.New("invalid utf8")
@ -673,6 +674,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
_ = cmd.Process.Signal(syscall.SIGTERM)
return err
}
cmd.Stderr = cmd.Stdout
if err := cmd.Start(); err != nil {
_ = cmd.Process.Signal(syscall.SIGTERM)
return err