From 42b7b6e511b3c6d559dbbd8acc5534deac8459f1 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 25 Apr 2023 11:31:15 +0800 Subject: [PATCH] [agent-go] [status] - update code --- agent-go/rabbitmq/OctopusMessage.go | 3 ++- agent-go/rabbitmq/RabbitMsgQueue.go | 4 ++-- agent-go/tmp/status-agentStatus.json | 8 ++++++++ agent-go/tmp/status-ping.json | 4 ++-- server/src/main/resources/bootstrap.yml | 12 ++++++------ 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/agent-go/rabbitmq/OctopusMessage.go b/agent-go/rabbitmq/OctopusMessage.go index 869bf8a..3553445 100644 --- a/agent-go/rabbitmq/OctopusMessage.go +++ b/agent-go/rabbitmq/OctopusMessage.go @@ -109,6 +109,7 @@ func executorOMHandler(octopusMessage *OctopusMessage) { func statusOMHandler(octopusMessage *OctopusMessage) { statusMsgString := octopusMessage.Content.(string) + var statusMessage *status.StatusMessage err := json.Unmarshal([]byte(statusMsgString), &statusMessage) if err != nil { @@ -132,5 +133,5 @@ func statusOMHandler(octopusMessage *OctopusMessage) { } func blackHoleOMHandler(octopusMessage *OctopusMessage) { - log.Error(fmt.Sprintf("octopusMessage type wrong! msg is => %v", octopusMessage)) + log.Error(fmt.Sprintf("[BLACK HOLE] octopusMessage type wrong! msg is => %v", octopusMessage)) } diff --git a/agent-go/rabbitmq/RabbitMsgQueue.go b/agent-go/rabbitmq/RabbitMsgQueue.go index d89111e..0193f84 100644 --- a/agent-go/rabbitmq/RabbitMsgQueue.go +++ b/agent-go/rabbitmq/RabbitMsgQueue.go @@ -90,7 +90,7 @@ func (r *RabbitQueue) Connect() { if err = ch.ExchangeDeclare( r.RabbitProp.ExchangeName, // name of the exchange r.RabbitProp.ExchangeType, // type of the exchange - false, // durable + true, // durable false, // delete when complete false, // internal false, // noWait @@ -101,7 +101,7 @@ func (r *RabbitQueue) Connect() { _, err = ch.QueueDeclare( r.RabbitProp.QueueName, // name of the queue - false, // durable + true, // durable false, // delete when unused false, // exclusive false, // noWait diff --git a/agent-go/tmp/status-agentStatus.json b/agent-go/tmp/status-agentStatus.json index e69de29..514957e 100644 --- a/agent-go/tmp/status-agentStatus.json +++ b/agent-go/tmp/status-agentStatus.json @@ -0,0 +1,8 @@ +{ + "uuid": "2023-03-27 14:38:49", + "init_time": "2023-03-27T14:38:49.8162801+08:00", + "type": "STATUS", + "content": "{\n\"type\": \"status\",\n\"agent_topic_name\": \"exampleAgentTopicName\",\n\"metric_repeat_count\": 0,\n\"metric_repeat_pinch\": 0\n}", + "result": "", + "ac_time": "0001-01-01T00:00:00Z" +} diff --git a/agent-go/tmp/status-ping.json b/agent-go/tmp/status-ping.json index 3046aa4..c821d60 100644 --- a/agent-go/tmp/status-ping.json +++ b/agent-go/tmp/status-ping.json @@ -1,8 +1,8 @@ { "uuid": "2023-03-27 14:38:49", "init_time": "2023-03-27T14:38:49.8162801+08:00", - "type": "PING", - "content": "ping", + "type": "STATUS", + "content": "{\n\"type\": \"ping\",\n\"agent_topic_name\": \"exampleAgentTopicName\",\n\"metric_repeat_count\": 0,\n\"metric_repeat_pinch\": 0\n}", "result": "", "ac_time": "0001-01-01T00:00:00Z" } diff --git a/server/src/main/resources/bootstrap.yml b/server/src/main/resources/bootstrap.yml index 47a0a39..c98f222 100644 --- a/server/src/main/resources/bootstrap.yml +++ b/server/src/main/resources/bootstrap.yml @@ -2,22 +2,22 @@ spring: application: name: octopus-server profiles: - active: k3s + active: local cloud: nacos: config: - group: k3s + group: local config-retry-time: 3000 file-extension: yaml max-retry: 3 - # server-addr: 43.154.83.213:21060 - server-addr: 150.230.198.103:21060 + server-addr: 42.192.52.227:21060 + # server-addr: 150.230.198.103:21060 # server-addr: https://nacos.107421.xyz:443 timeout: 5000 config-long-poll-timeout: 5000 extension-configs: - - group: k3s - data-id: common-k3s.yaml + - group: local + data-id: common-local.yaml server: port: 9999 \ No newline at end of file