jd/xdd-plus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x

Browse Source
This commit is contained in:
cdle 2021-08-19 10:05:17 +08:00
parent aa54dc1e09
commit 8126aa4de0
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
models/task.go
View File

@ -114,17 +114,29 @@ func runTask(task *Task, msgs ...interface{}) string {
lan, task.Name) lan, task.Name)
cmd := exec.Command("sh", "-c", sh) cmd := exec.Command("sh", "-c", sh)
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
stderr, err := cmd.StderrPipe()
if err != nil { if err != nil {
logs.Warn("cmd.StdoutPipe: ", err) logs.Warn("cmd.StdoutPipe: ", err)
return "" return ""
} }
cmd.Dir = ExecPath + "/scripts/" cmd.Dir = ExecPath + "/scripts/"
cmd.Stderr = os.Stderr
err = cmd.Start() err = cmd.Start()
if err != nil { if err != nil {
logs.Warn("%v", err) logs.Warn("%v", err)
return "" return ""
} }
go func() {
msg := ""
reader := bufio.NewReader(stderr)
for {
line, err2 := reader.ReadString('\n')
if err2 != nil || io.EOF == err2 {
break
}
msg += line
}
sendMessagee(msg, msgs...)
}()
reader := bufio.NewReader(stdout) reader := bufio.NewReader(stdout)
for { for {
line, err2 := reader.ReadString('\n') line, err2 := reader.ReadString('\n')