修改运行shell逻辑
This commit is contained in:
parent
e4e12324fe
commit
5525fe6f2f
|
|
@ -130,13 +130,10 @@ func GetShellWillRunFromMaster(server string) ([]dao.Shell, error) {
|
||||||
|
|
||||||
func RunShell(script string) (res, err string) {
|
func RunShell(script string) (res, err string) {
|
||||||
cmd := exec.Command("/bin/bash", "-c", script)
|
cmd := exec.Command("/bin/bash", "-c", script)
|
||||||
// 使用bytes.Buffer捕获输出
|
output, err3 := cmd.CombinedOutput()
|
||||||
var out bytes.Buffer
|
|
||||||
cmd.Stdout = &out
|
|
||||||
err3 := cmd.Run()
|
|
||||||
err3_info := ""
|
err3_info := ""
|
||||||
if err3 != nil {
|
if err3 != nil {
|
||||||
err3_info = err3.Error()
|
err3_info = err3.Error()
|
||||||
}
|
}
|
||||||
return strings.TrimSpace(out.String()), err3_info
|
return strings.TrimSpace(string(output)), err3_info
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue