diff --git a/cmd/server/app/agentmanager/cmd.go b/cmd/server/app/agentmanager/cmd.go index ca79f3a3873fdd7da7b56847b4bc5ec4a589499d..3565bb86960bdc6f11449a71036765794f2fa096 100644 --- a/cmd/server/app/agentmanager/cmd.go +++ b/cmd/server/app/agentmanager/cmd.go @@ -1,7 +1,6 @@ package agentmanager import ( - "errors" "fmt" "gitee.com/openeuler/PilotGo/pkg/utils" @@ -22,22 +21,22 @@ func (a *Agent) RunCommand(cmd string) (*utils.CmdResult, error) { }, } - resp_message, err := a.sendMessage(msg, true) + respMessage, err := a.sendMessage(msg, true) if err != nil { - logger.Error("failed to run command on agent") + logger.Error("failed to run command on agent: %v", err) return nil, err } - if resp_message.Status == 0 { - //状态为-1的时候不会有数据 + if respMessage.Status == 0 { + //当状态为0时,表示命令执行成功,可以解析返回的数据。状态为-1的时候不会有数据 result := &utils.CmdResult{} - err = resp_message.BindData(result) + err = respMessage.BindData(result) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to bind command result: %v", err) } return result, nil } - return nil, errors.New(resp_message.Error) + return nil, fmt.Errorf("agent returned error: %s", respMessage.Error) } // 远程在agent上运行脚本文件 @@ -54,21 +53,21 @@ func (a *Agent) RunScript(script string, params []string) (*utils.CmdResult, err }, } - resp_message, err := a.sendMessage(msg, true) + respMessage, err := a.sendMessage(msg, true) if err != nil { - logger.Error("failed to run script on agent") + logger.Error("failed to run script on agent: %v", err) return nil, err } - if resp_message.Status == 0 { + if respMessage.Status == 0 { result := &utils.CmdResult{} - err = resp_message.BindData(result) + err = respMessage.BindData(result) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to bind command result: %v", err) } return result, nil } - return nil, errors.New(resp_message.Error) + return nil, fmt.Errorf("agent returned error: %s", respMessage.Error) } // chmod [-R] 权限值 文件名 @@ -79,18 +78,18 @@ func (a *Agent) ChangePermission(permission, file string) (string, error) { Data: permission + "," + file, } - resp_message, err := a.sendMessage(msg, true) + respMessage, err := a.sendMessage(msg, true) if err != nil { logger.Error("failed to run script on agent") return "", err } - if resp_message.Status == -1 || resp_message.Error != "" { - logger.Error("failed to run script on agent: %s", resp_message.Error) - return "", fmt.Errorf(resp_message.Error) + if respMessage.Status == -1 || respMessage.Error != "" { + logger.Error("failed to run script on agent: %s", respMessage.Error) + return "", fmt.Errorf(respMessage.Error) } - return resp_message.Data.(string), nil + return respMessage.Data.(string), nil } // chown [-R] 所有者 文件或目录 @@ -101,18 +100,18 @@ func (a *Agent) ChangeFileOwner(user, file string) (string, error) { Data: user + "," + file, } - resp_message, err := a.sendMessage(msg, true) + respMessage, err := a.sendMessage(msg, true) if err != nil { logger.Error("failed to run script on agent") return "", err } - if resp_message.Status == -1 || resp_message.Error != "" { - logger.Error("failed to run script on agent: %s", resp_message.Error) - return "", fmt.Errorf(resp_message.Error) + if respMessage.Status == -1 || respMessage.Error != "" { + logger.Error("failed to run script on agent: %s", respMessage.Error) + return "", fmt.Errorf(respMessage.Error) } - return resp_message.Data.(string), nil + return respMessage.Data.(string), nil } // 临时修改agent端系统参数 @@ -123,16 +122,16 @@ func (a *Agent) ChangeSysctl(args string) (string, error) { Data: args, } - resp_message, err := a.sendMessage(msg, true) + respMessage, err := a.sendMessage(msg, true) if err != nil { logger.Error("failed to run script on agent") return "", err } - if resp_message.Status == -1 || resp_message.Error != "" { - logger.Error("failed to run script on agent: %s", resp_message.Error) - return "", fmt.Errorf(resp_message.Error) + if respMessage.Status == -1 || respMessage.Error != "" { + logger.Error("failed to run script on agent: %s", respMessage.Error) + return "", fmt.Errorf(respMessage.Error) } - return resp_message.Data.(string), nil + return respMessage.Data.(string), nil } diff --git a/cmd/server/app/network/controller/agentcontroller/cron.go b/cmd/server/app/network/controller/agentcontroller/cron.go index 6001607e01ab2918f72d7cb7f85b5a63ce4ddf61..69acd9d70c0ef4448eefd5eb32854941428a4f13 100644 --- a/cmd/server/app/network/controller/agentcontroller/cron.go +++ b/cmd/server/app/network/controller/agentcontroller/cron.go @@ -25,6 +25,7 @@ import ( "github.com/gin-gonic/gin" ) +// CreatCron 创建定时任务 func CreatCron(c *gin.Context) { // 存入数据库 var newCron cron.CrontabUpdate @@ -91,6 +92,7 @@ func CreatCron(c *gin.Context) { response.Success(c, gin.H{"data": newCron, "cron": cron_start}, "任务已生效") } +// DeleteCronTask 是一个删除定时任务的函数 func DeleteCronTask(c *gin.Context) { var crons cron.DelCrons var cronIds string @@ -114,6 +116,7 @@ func DeleteCronTask(c *gin.Context) { response.Success(c, nil, "任务删除成功!") } +// UpdateCron 是一个处理更新定时任务的函数 func UpdateCron(c *gin.Context) { var Cron cron.CrontabUpdate c.Bind(&Cron) @@ -157,6 +160,7 @@ func UpdateCron(c *gin.Context) { response.Success(c, gin.H{"cron": cron_start}, "任务更新成功,已开始执行") } +// CronTaskStatus 处理任务状态更新请求 func CronTaskStatus(c *gin.Context) { var Cron cron.CrontabUpdate c.Bind(&Cron) @@ -201,6 +205,7 @@ func CronTaskStatus(c *gin.Context) { response.Success(c, gin.H{"cron": cron_start}, "任务已开启") } +// CronTaskList 获取定时任务列表 func CronTaskList(c *gin.Context) { uuid := c.Query("uuid") @@ -211,8 +216,8 @@ func CronTaskList(c *gin.Context) { return } - num := query.Size * (query.CurrentPageNum - 1) - total, data, err := cron.CronListPaged(uuid, num, query.Size) + offset := query.Size * (query.CurrentPageNum - 1) + total, data, err := cron.CronListPaged(uuid, offset, query.Size) if err != nil { response.Fail(c, gin.H{"status": false}, err.Error()) return