opensource/panel
3
0
Fork 0
mirror of https://github.com/tnb-labs/panel.git synced 2026-08-30 17:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: shell 执行失败时丢失 cmd.Run 真实错误

Browse Source 
当 cmd.Dir 不存在或 exec 启动失败时，Go 在进入 bash 前就返回错误，stderr 为空，原本只取 stderr 的错误格式会输出空 err，导致排查困难。改为同时携带 cmd.Run 的真实错误和 stderr。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
耗子
2026-04-27 17:28:09 +08:00
parent db8064fbe3
commit dc62ecf1dd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/shell/exec.go
+5 -5
View File
@@ -25,7 +25,7 @@ func Exec(shell string) (string, error) {
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, strings.TrimSpace(stderr.String()))
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %w, stderr: %s", shell, err, strings.TrimSpace(stderr.String()))
}
return strings.TrimSpace(stdout.String()), nil
@@ -69,7 +69,7 @@ func Execf(shell string, args ...any) (string, error) {
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, strings.TrimSpace(stderr.String()))
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %w, stderr: %s", shell, err, strings.TrimSpace(stderr.String()))
}
return strings.TrimSpace(stdout.String()), nil
@@ -119,7 +119,7 @@ func ExecfWithTimeout(timeout time.Duration, shell string, args ...any) (string,
err := cmd.Start()
if err != nil {
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, strings.TrimSpace(stderr.String()))
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %w, stderr: %s", shell, err, strings.TrimSpace(stderr.String()))
}
done := make(chan error)
@@ -133,7 +133,7 @@ func ExecfWithTimeout(timeout time.Duration, shell string, args ...any) (string,
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, "timeout")
case err = <-done:
if err != nil {
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, strings.TrimSpace(stderr.String()))
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %w, stderr: %s", shell, err, strings.TrimSpace(stderr.String()))
}
}
@@ -200,7 +200,7 @@ func ExecfWithDir(dir, shell string, args ...any) (string, error) {
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %s", shell, strings.TrimSpace(stderr.String()))
return strings.TrimSpace(stdout.String()), fmt.Errorf("run %s failed, err: %w, stderr: %s", shell, err, strings.TrimSpace(stderr.String()))
}
return strings.TrimSpace(stdout.String()), nil