From 499711b4dddf33299e19cf2510509cf635395d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E7=81=BF?= Date: Tue, 27 Jun 2023 16:44:59 +0800 Subject: [PATCH] err fix --- src/service/task_manage.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 1dcf9eb..765a58b 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -150,12 +150,10 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, var ipList []string db, err := client.GetDbClient() if err != nil { - err = resp.DbConnectError.WithError(err) - return + return nil, resp.DbConnectError.WithError(err) } 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 + return nil, resp.DbSelectError.WithError(err) } //写入主机组ip f, err := os.Open("/etc/ansible/hosts") @@ -173,8 +171,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, //写入执行脚本 f2, err := os.Create("/etc/ansible/ansible.yml") if err != nil { - err = resp.FileExecError.WithError(err) - return + return nil, resp.FileExecError.WithError(err) } defer f2.Close() _, err = f2.Write([]byte(req.Script)) @@ -186,8 +183,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, //写入执行脚本 f3, err := os.Create("/etc/ansible/ansible_extra.yml") if err != nil { - err = resp.FileExecError.WithError(err) - return + return nil, resp.FileExecError.WithError(err) } defer f3.Close() _, err = f3.Write([]byte(req.Value)) -- 2.26.0