Make the error handling go-esque

typeless · typeless · commit 7dbf2d2120cb · 2017-11-13T16:44:28.000+08:00
diff --git a/modules/process/manager.go b/modules/process/manager.go
@@ -116,12 +116,11 @@ func (pm *Manager) ExecDirEnv(timeout time.Duration, dir, desc string, env []str
 	err := cmd.Wait()
 	pm.Remove(pid)
 
-	if err == nil {
-		return stdOut.String(), stdErr.String(), nil
+	if err != nil {
+		err = fmt.Errorf("exec(%d:%s) failed: %v(%v) stdout: %v stderr: %v", pid, desc, err, ctx.Err(), stdOut, stdErr)
 	}
 
-	out := fmt.Errorf("exec(%d:%s) failed: %v stdout: %v stderr: %v", pid, desc, ctx.Err(), stdOut, stdErr)
-	return stdOut.String(), stdErr.String(), out
+	return stdOut.String(), stdErr.String(), err
 }
 
 // Kill and remove a process from list.

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,11 @@ func (pm *Manager) ExecDirEnv(timeout time.Duration, dir, desc string, env []str`
`116`	`116`	`err := cmd.Wait()`
`117`	`117`	`pm.Remove(pid)`
`118`	`118`
`119`		`- if err == nil {`
`120`		`- return stdOut.String(), stdErr.String(), nil`
	`119`	`+ if err != nil {`
	`120`	`+ err = fmt.Errorf("exec(%d:%s) failed: %v(%v) stdout: %v stderr: %v", pid, desc, err, ctx.Err(), stdOut, stdErr)`
`121`	`121`	`}`
`122`	`122`
`123`		`- out := fmt.Errorf("exec(%d:%s) failed: %v stdout: %v stderr: %v", pid, desc, ctx.Err(), stdOut, stdErr)`
`124`		`- return stdOut.String(), stdErr.String(), out`
	`123`	`+ return stdOut.String(), stdErr.String(), err`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`// Kill and remove a process from list.`