feat(pkg.tasker): capture cmd output in tasker logger, error in stderr

adhocore · May 5, 2021 · 0da0aae · 0da0aae
1 parent eb928c4
commit 0da0aae
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/pkg/tasker/tasker.go b/pkg/tasker/tasker.go
@@ -90,15 +90,27 @@ func New(opt Option) *Tasker {
 }
 
 // Taskify creates TaskFunc out of plain command wrt given options.
-func Taskify(cmd string, opt Option) TaskFunc {
+func (t *Tasker) Taskify(cmd string, opt Option) TaskFunc {
 	sh := Shell(opt.Shell)
 
 	return func(ctx context.Context) (int, error) {
-		err := exec.Command(sh[0], sh[1], cmd).Run()
+		buf := strings.Builder{}
+		exc := exec.Command(sh[0], sh[1], cmd)
+		exc.Stderr = &buf
+
+		if t.Log.Writer() != exc.Stderr {
+			exc.Stdout = t.Log.Writer()
+		}
+
+		err := exc.Run()
 		if err == nil {
 			return 0, nil
 		}
 
+		for _, ln := range strings.Split(strings.TrimRight(buf.String(), "\r\n"), "\n") {
+			log.Println(ln)
+		}
+
 		code := 1
 		if exErr, ok := err.(*exec.ExitError); ok {
 			code = exErr.ExitCode()