Commit 499711b4 authored by 魏灿's avatar 魏灿

err fix

parent 39624e4b
...@@ -150,12 +150,10 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, ...@@ -150,12 +150,10 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{},
var ipList []string var ipList []string
db, err := client.GetDbClient() db, err := client.GetDbClient()
if err != nil { if err != nil {
err = resp.DbConnectError.WithError(err) return nil, resp.DbConnectError.WithError(err)
return
} }
if err := db.Table("host_manage_list").Select("ip").Where("host_group_id = ?", req.HostGroupId).Find(&ipList); err != nil { if err := db.Table("host_manage_list").Select("ip").Where("host_group_id = ?", req.HostGroupId).Find(&ipList); err != nil {
err = resp.DbSelectError.WithError(err) return nil, resp.DbSelectError.WithError(err)
return
} }
//写入主机组ip //写入主机组ip
f, err := os.Open("/etc/ansible/hosts") f, err := os.Open("/etc/ansible/hosts")
...@@ -173,8 +171,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, ...@@ -173,8 +171,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{},
//写入执行脚本 //写入执行脚本
f2, err := os.Create("/etc/ansible/ansible.yml") f2, err := os.Create("/etc/ansible/ansible.yml")
if err != nil { if err != nil {
err = resp.FileExecError.WithError(err) return nil, resp.FileExecError.WithError(err)
return
} }
defer f2.Close() defer f2.Close()
_, err = f2.Write([]byte(req.Script)) _, err = f2.Write([]byte(req.Script))
...@@ -186,8 +183,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, ...@@ -186,8 +183,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{},
//写入执行脚本 //写入执行脚本
f3, err := os.Create("/etc/ansible/ansible_extra.yml") f3, err := os.Create("/etc/ansible/ansible_extra.yml")
if err != nil { if err != nil {
err = resp.FileExecError.WithError(err) return nil, resp.FileExecError.WithError(err)
return
} }
defer f3.Close() defer f3.Close()
_, err = f3.Write([]byte(req.Value)) _, err = f3.Write([]byte(req.Value))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment