Skip to content

Commit 7889b5a

Browse files
authored
fix: Optimize script-type cronjob execution output (#9326)
1 parent be6d3ea commit 7889b5a

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

agent/utils/cmd/cmdx.go

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,22 +136,15 @@ func (c *CommandHelper) run(name string, arg ...string) (string, error) {
136136
cmd.Dir = c.workDir
137137
}
138138

139+
err := cmd.Run()
140+
if c.taskItem != nil {
141+
customWriter.Flush()
142+
}
139143
if c.timeout != 0 {
140-
err := cmd.Run()
141-
if c.taskItem != nil {
142-
customWriter.Flush()
143-
}
144144
if ctx != nil && errors.Is(ctx.Err(), context.DeadlineExceeded) {
145145
return "", buserr.New("ErrCmdTimeout")
146146
}
147-
if err != nil {
148-
149-
return handleErr(stdout, stderr, c.IgnoreExist1, err)
150-
}
151-
return stdout.String(), nil
152147
}
153-
154-
err := cmd.Run()
155148
if err != nil {
156149
return handleErr(stdout, stderr, c.IgnoreExist1, err)
157150
}

0 commit comments

Comments
 (0)