From 25f1dd029a2fa5a625946f399d053a1dd070c468 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Wed, 8 Nov 2023 16:42:08 +0800
Subject: [PATCH] [ Agent ] [ Initialization ] - modify Initialization process
 - 1

---
 agent-go/AgentInitialization.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/agent-go/AgentInitialization.go b/agent-go/AgentInitialization.go
index 0f21925..2c75c5d 100644
--- a/agent-go/AgentInitialization.go
+++ b/agent-go/AgentInitialization.go
@@ -172,14 +172,14 @@ func shutdownRegisterQueueConnection(initFromServerQueue *rabbitmq.RabbitQueue,
 func parseAgentServerInfo(agentServerInfoConf string) *register.AgentServerInfo {
 
 	// 约定文件地址为 /octopus-agent/octopus-agent.conf
-	var agentServerInfo *register.AgentServerInfo
+	var agentServerInfo register.AgentServerInfo
 	yamlFile, err := ioutil.ReadFile(agentServerInfoConf)
 
 	if err != nil {
 		panic(fmt.Errorf("failed to read YAML file: %v", err))
 	}
 
-	err = yaml.Unmarshal(yamlFile, &agentServerInfo)
+	err = yaml.Unmarshal(yamlFile, agentServerInfo)
 	if err != nil {
 		panic(fmt.Errorf("failed to unmarshal YAML: %v", err))
 	}
@@ -197,11 +197,11 @@ func parseAgentServerInfo(agentServerInfoConf string) *register.AgentServerInfo
 	// build operator cache
 	BuildAgentOsOperator(agentServerInfo)
 
-	return agentServerInfo
+	return &agentServerInfo
 }
 
 // UniformAgentServerInfo uniform deal with ip
-func UniformAgentServerInfo(agentServerInfo *register.AgentServerInfo) {
+func UniformAgentServerInfo(agentServerInfo register.AgentServerInfo) {
 
 	// reflect to iterator all field
 	log.Info("[Initialization] - UniformAgentServerInfo !")
@@ -224,7 +224,7 @@ func UniformAgentServerInfo(agentServerInfo *register.AgentServerInfo) {
 
 }
 
-func BuildAgentOsOperator(agentServerInfo *register.AgentServerInfo) {
+func BuildAgentOsOperator(agentServerInfo register.AgentServerInfo) {
 
 	// 2023年8月4日 passthrough some key information
 	ossOfflinePrefix := g.G.AgentConfig.GetString("octopus.agent.executor.ossOfflinePrefix")
@@ -236,7 +236,7 @@ func BuildAgentOsOperator(agentServerInfo *register.AgentServerInfo) {
 	agentOsOperator := executor.BuildAgentOsOperator(agentServerInfo.OSInfo, ossOfflinePrefix)
 
 	// assign the agentServerInfo
-	agentOsOperator.AgentServerInfo = agentServerInfo
+	agentOsOperator.AgentServerInfo = &agentServerInfo
 
 	// debug
 	marshal, _ := json.Marshal(agentOsOperator)