[ 项目 ] 优化业务队列等待逻辑

agent-go/AgentInitialization.go

@@ -15,13 +15,16 @@ import (
 var omType = g.InitOmType
 var P = g.G.P
 
-var AgentServerInfoCache = &register.AgentServerInfo{}
+//var AgentServerInfoCache = &register.AgentServerInfo{}
 
-func INIT(agentServerInfoConf string) *register.AgentServerInfo {
+func INIT(agentServerInfoConf string) chan bool {
 
 	// 获取系统的环境变量
 	agentServerInfo := parseAgentServerInfo(agentServerInfoConf)
 
+	// 缓存此内容
+	//AgentServerInfoCache = agentServerInfo
+
 	agentConfig := g.G.AgentConfig
 
 	initToServerProp := &rabbitmq.ConnectProperty{
@@ -73,7 +76,6 @@ func INIT(agentServerInfoConf string) *register.AgentServerInfo {
 				time.Sleep(10 * time.Minute)
 
 			}
-
 		})
 
 	// 监听初始化连接中的信息
@@ -86,13 +88,13 @@ func INIT(agentServerInfoConf string) *register.AgentServerInfo {
 	initFromServerQueue.Connect()
 
 	// 建立运行时RabbitMQ连接
-	handleInitMsgFromServer(initFromServerQueue, initToServerQueue, agentServerInfo)
+	businessForeverChan := handleInitMsgFromServer(initFromServerQueue, initToServerQueue, agentServerInfo)
 
-	return agentServerInfo
+	return businessForeverChan
 }
 
 // handleInitMsgFromServer 处理从Server接收的 注册信息
-func handleInitMsgFromServer(initFromServerQueue *rabbitmq.RabbitQueue, initToServerQueue *rabbitmq.RabbitQueue, agentServerInfo *register.AgentServerInfo) {
+func handleInitMsgFromServer(initFromServerQueue *rabbitmq.RabbitQueue, initToServerQueue *rabbitmq.RabbitQueue, agentServerInfo *register.AgentServerInfo) chan bool {
 
 	initOctopusMessageDeliveries := initFromServerQueue.Read(false)
 
@@ -151,8 +153,9 @@ func handleInitMsgFromServer(initFromServerQueue *rabbitmq.RabbitQueue, initToSe
 	}
 
 	// 建立 运行时 RabbitMQ连接
-	rabbitmq.BuildOMsgRuntimeConnectorQueue(findRealAgentTopicName)
+	runtimeConnectorQueue := rabbitmq.BuildOMsgRuntimeConnectorQueue(findRealAgentTopicName)
 
+	return runtimeConnectorQueue
 }
 
 // shutdownRegisterQueueConnection 关闭初始化连接的两个队列