From f43d9f84a44c26e4c081f0031c0e35c56fe96c99 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 28 Feb 2023 10:34:48 +0800
Subject: [PATCH] [agent][init]- fix bugs

---
 .../bootup/OctopusAgentInitService.java           |  8 ++++----
 .../message/GenOctopusRabbitMQConnection.java     |  7 +++++--
 .../common/handler/GlobalExceptionHandler.java    | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java b/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java
index 11d7e7b..985eed0 100644
--- a/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java
+++ b/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java
@@ -9,7 +9,6 @@ import io.wdd.common.beans.rabbitmq.OctopusMessage;
 import io.wdd.common.handler.MyRuntimeException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.*;
 import org.springframework.amqp.support.AmqpHeaders;
@@ -88,7 +87,9 @@ public class OctopusAgentInitService {
 
             // response chain to handle all kind of type of octopus message
             if (!octopusMessageHandler.handle(octopusMessage)) {
-                throw new MyRuntimeException(" Handle Octopus Message Error !");
+                String s = "Handle Octopus Message Error !";
+                log.error(s);
+                throw new MyRuntimeException(s);
             }
 
         } catch (Exception e) {
@@ -98,8 +99,7 @@ public class OctopusAgentInitService {
             // long deliveryTag, boolean requeue
             // channel.basicReject(deliveryTag,true);
 
-            log.error("Octopus Agent Initialization Error, please check !");
-            log.info("waiting for 5 seconds");
+            log.error("Octopus Agent Initialization Error, please check !  Waiting for 5 seconds");
 
             // 这里只是便于出现死循环时查看
             TimeUnit.SECONDS.sleep(5);
diff --git a/agent/src/main/java/io/wdd/agent/initialization/message/GenOctopusRabbitMQConnection.java b/agent/src/main/java/io/wdd/agent/initialization/message/GenOctopusRabbitMQConnection.java
index b5a74a5..6b8dbd0 100644
--- a/agent/src/main/java/io/wdd/agent/initialization/message/GenOctopusRabbitMQConnection.java
+++ b/agent/src/main/java/io/wdd/agent/initialization/message/GenOctopusRabbitMQConnection.java
@@ -49,8 +49,11 @@ public class GenOctopusRabbitMQConnection {
         // reboot judgement of existing exchange
         QueueInformation queueInfo = rabbitAdmin.getQueueInfo(agentTopicName);
 
-        if (ObjectUtils.isNotEmpty(queueInfo) && queueInfo.getConsumerCount() > 0 ) {
-            log.info("Octopus Agent Specific Topic Queue Already Existed ! == {}", agentTopicName);
+        if (ObjectUtils.isNotEmpty(queueInfo)) {
+            log.info(
+                    "Octopus Agent Specific Topic Queue Already Existed ! == {}",
+                    agentTopicName
+            );
             return;
         }
 
diff --git a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java b/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java
index 12fc79d..1ee6acc 100644
--- a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java
+++ b/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java
@@ -10,6 +10,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -91,6 +92,20 @@ public class GlobalExceptionHandler {
         return vo;
     }
 
+    /**
+     * 处理此种异常
+     *
+     * @param httpRequestMethodNotSupportedException
+     */
+    @ExceptionHandler(value = {HttpRequestMethodNotSupportedException.class})
+    public void methodNotMatchHandler(HttpRequestMethodNotSupportedException httpRequestMethodNotSupportedException) {
+
+        log.debug(
+                httpRequestMethodNotSupportedException.getMessage()
+        );
+
+    }
+
     /**
      * 拦截数据库异常
      *