diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 00a06e9645cc597413e3ca95738d277237268e41..49e9f04b96220887d5303e70e37914b5d4e2d936 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -272,85 +272,6 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq, script string) (id return } go ExecAnsible(id, req.TaskId, req.Value) - ////执行ansible命令 - //var cmd *exec.Cmd - //if req.Value != "" { - // cmd = exec.Command("ansible-playbook", "-i", "/etc/ansible/hosts_"+fmt.Sprintf("%d", req.TaskId), "/etc/ansible/ansible_"+fmt.Sprintf("%d", req.TaskId)+".yml", "--extra-vars", req.Value) - //} else { - // cmd = exec.Command("ansible-playbook", "-i", "/etc/ansible/hosts_"+fmt.Sprintf("%d", req.TaskId), "/etc/ansible/ansible_"+fmt.Sprintf("%d", req.TaskId)+".yml") - //} - ////ansible-playbook -i /tmp/hosts --list-hosts debug.yml - ////捕获正常日志 - //stdout, err := cmd.StdoutPipe() - //if err != nil { - // err = resp.CmdExecError.WithError(err) - // return - //} - ////捕获异常日志 - //stderr, err := cmd.StderrPipe() - //if err != nil { - // err = resp.CmdExecError.WithError(err) - // return - //} - ////执行cmd命令 - //if err = cmd.Start(); err != nil { - // err = resp.CmdExecError.WithError(err) - // return - //} - ////获取 正常/异常 输出流 - //outputBuf := bufio.NewReader(stdout) - //readerr := bufio.NewReader(stderr) - // - //var out, outErr int - //var execLog string - //for { - // - // //逐行输出日志 - // lineOut, err1 := outputBuf.ReadString('\n') - // if (err1 != nil || io.EOF == err1) && out == 0 { - // out = 1 - // } else if out == 0 { - // //存储执行日志 - // execLog = execLog + lineOut + " \n " - // UpdateExecHistory(request.UpdateExecHistory{ - // TaskHistoryId: id, - // ExecLog: execLog, - // }) - // } - // - // lineErr, err2 := readerr.ReadString('\n') - // if (err2 != nil || io.EOF == err2) && outErr == 0 { - // outErr = 1 - // } else if outErr == 0 { - // //存储异常执行日志 - // execLog = execLog + lineErr + " \n " - // UpdateExecHistory(request.UpdateExecHistory{ - // TaskHistoryId: id, - // ExecLog: execLog, - // }) - // } - // - // if out == 1 && outErr == 1 { - // break - // } - //} - //cmd.Wait() - // - //if cmd.ProcessState.Success() { - // //任务执行成功 - // UpdateExecHistory(request.UpdateExecHistory{ - // TaskHistoryId: id, - // ExecLog: execLog, - // State: 1, - // }) - //} else { - // //任务执行失败 - // UpdateExecHistory(request.UpdateExecHistory{ - // TaskHistoryId: id, - // ExecLog: execLog, - // State: 2, - // }) - //} return }