Skip to content

Commit 86ec8f4

Browse files
committed
call output callback even when error occure
1 parent aeb14e7 commit 86ec8f4

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

pkg/executer/local.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ func (e Local) Run(task config.Task, callback OnRunCallback) error {
2525
}
2626

2727
script := fmt.Sprintf("%s -se <<EOF\n set -e\n%s\nEOF", bash, strings.Join(task.Commands, "\n"))
28-
if err := cmd.Run(script); err == nil {
29-
callback(out)
30-
}
28+
err = cmd.Run(script)
29+
callback(out)
3130

3231
return err
3332
}

pkg/executer/parallel.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ func (e Parallel) Run(task config.Task, callback OnRunCallback) error {
5050
"%s %s '%s' -se <<EOF\n set -e\n%s\nEOF",
5151
ssh, srv.Target(), bash, strings.Join(task.Commands, "\n"),
5252
)
53-
if err := cmd.Run(script); err == nil {
54-
callback(out)
55-
}
53+
err = cmd.Run(script)
54+
callback(out)
5655

5756
return err
5857
})

pkg/executer/ssh.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ func (e SSH) Run(task config.Task, callback OnRunCallback) error {
4343
"%s %s '%s' -se <<EOF\n set -e\n%s\nEOF",
4444
ssh, srv.Target(), bash, strings.Join(task.Commands, "\n"),
4545
)
46-
if err := cmd.Run(script); err == nil {
47-
callback(out)
48-
}
46+
err = cmd.Run(script)
47+
callback(out)
4948

5049
return err
5150
}

0 commit comments

Comments
 (0)