From d2c57f8d7b24f20945e32a982a25d581b11eea96 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Thu, 10 Aug 2023 17:18:08 +0800 Subject: [PATCH] =?UTF-8?q?[=20Service=20]=20[=20Executor=20]=20=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E9=87=8D=E6=9E=84Executor=E9=83=A8=E5=88=86=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent-go/AgentInitialization.go | 5 +++-- .../rpc/message/sender/OMessageToAgentSender.java | 13 ------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/agent-go/AgentInitialization.go b/agent-go/AgentInitialization.go index ca7abe4..e4f281a 100644 --- a/agent-go/AgentInitialization.go +++ b/agent-go/AgentInitialization.go @@ -9,6 +9,7 @@ import ( "fmt" "gopkg.in/yaml.v3" "io/ioutil" + "strings" "time" ) @@ -126,7 +127,7 @@ func handleInitMsgFromServer(initFromServerQueue *rabbitmq.RabbitQueue, initToSe serverName := serverInfo.ServerName // 处理OM信息 - if initOctopusMsg != nil && initOctopusMsg.Type == g.InitOmType && serverName == agentServerInfo.ServerName { + if initOctopusMsg != nil && strings.HasPrefix(initOctopusMsg.Type, g.InitOmType) && strings.HasPrefix(serverName, agentServerInfo.ServerName) { // 是本机的注册回复信息 log.InfoF("OctopusMessage INIT from server is this agent !") @@ -144,7 +145,7 @@ func handleInitMsgFromServer(initFromServerQueue *rabbitmq.RabbitQueue, initToSe } else { // 不是自身的 注册回复信息 -- 拒绝 2023年6月19日 此处存在错误！ 会死循环Nack 导致异常 - log.Warn(fmt.Sprintf("OctopusMessage INIT from server not this agent ! => %v, ==>%s", initOctopusMsg, delivery.Body)) + log.Warn(fmt.Sprintf("OctopusMessage INIT from server not this agent ! => %v, ", initOctopusMsg)) delivery.Ack(false) // 需要休眠等待不再获取相应的信息 diff --git a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java index aa5c86a..aac1eea 100644 --- a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java +++ b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java @@ -52,19 +52,6 @@ public class OMessageToAgentSender { octopusMessage ); - // 统一处理Content - if (octopusMessage.getContent() instanceof String) { - try { - - String contendString = OctopusObjectMapper.writeValueAsString(octopusMessage.getContent()); - - octopusMessage.setContent(contendString); - - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - rabbitTemplate.convertAndSend( initRabbitMQConfig.INIT_EXCHANGE, initRabbitMQConfig.INIT_FROM_SERVER_KEY,