mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-10-07 22:16:16 +08:00
fix: 解决容器日志缺失的问题 (#4549)
This commit is contained in:
parent
c5bb8dab8c
commit
5cfdcedf9a
1 changed files with 2 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue