1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 15:06:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/app/service/container.go
View file

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