From 816931f922859e82f9e8a63ebe458a326fc19b3a Mon Sep 17 00:00:00 2001 From: wubijie Date: Wed, 13 Nov 2024 13:57:30 +0800 Subject: [PATCH] Complete the execution result of the repo-config machine --- configmanage/server/service/repo.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go index 91bc6192..e7d61fa1 100644 --- a/configmanage/server/service/repo.go +++ b/configmanage/server/service/repo.go @@ -13,6 +13,7 @@ import ( "gitee.com/openeuler/PilotGo/sdk/plugin/client" "gitee.com/openeuler/PilotGo/sdk/utils/httputils" "github.com/google/uuid" + "openeuler.org/PilotGo/configmanage-plugin/global" "openeuler.org/PilotGo/configmanage-plugin/internal" ) @@ -87,7 +88,7 @@ func (rc *RepoConfig) Load() error { return nil } -func (rc *RepoConfig) Apply() (json.RawMessage, error) { +func (rc *RepoConfig) Apply() ([]NodeResult, error) { //从数据库获取下发的信息 rf, err := internal.GetRepoFileByUUID(rc.UUID) if err != nil { @@ -116,7 +117,7 @@ func (rc *RepoConfig) Apply() (json.RawMessage, error) { if err != nil { return nil, err } - result := "" + results := []NodeResult{} for _, v := range Repofiles { de := Deploy{ DeployBatch: common.Batch{ @@ -154,17 +155,23 @@ func (rc *RepoConfig) Apply() (json.RawMessage, error) { // 将执行失败的文件、机器信息和原因添加到结果字符串中 for _, d := range data { if d.Error != "" { - result = result + v.Content + "文件" + d.UUID + ":" + d.Error + "\n" + results = append(results, NodeResult{ + Type: global.Repo, + NodeUUID: d.UUID, + Detail: v.Content, + Result: false, + Err: d.Error, + }) } } } //TODO:部分成功如何修改数据库 - if result == "" { + if results == nil { //下发成功修改数据库应用版本 err = rf.UpdateByuuid() return nil, err } - return nil, errors.New(result + "failed to apply repo config") + return results, errors.New("failed to apply repo config") } func (rc *RepoConfig) Collect() error { -- Gitee