(shenyu) branch master updated: Fixes #6886:移除 RocketMQ 日志客户端重复注册的关闭钩子 (#6927)

[liuhongyu]

This is an automated email from the ASF dual-hosted git repository.

Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new c7178b20f8 Fixes #6886:移除 RocketMQ 日志客户端重复注册的关闭钩子 (#6927)
c7178b20f8 is described below

commit c7178b20f84051ab9f63108ead47e3da4bcc5a91
Author: BobSong <2434005...@qq.com>
AuthorDate: Mon Aug 17 12:10:54 2026 +0800

    Fixes #6886:移除 RocketMQ 日志客户端重复注册的关闭钩子 (#6927)
    
    * fix: remove duplicate RocketMQ shutdown hook (#6886)
    
    * ci: wait for sync services before Spring Cloud E2E tests
    
    ---------
    
    Co-authored-by: aias00 <liuhon...@apache.org>
---
 .../compose/script/e2e-springcloud-sync-compose.sh    | 19 ++++++++++---------
 .../rocketmq/client/RocketMQLogCollectClient.java     |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/compose/script/e2e-springcloud-sync-compose.sh
 
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/compose/script/e2e-springcloud-sync-compose.sh
index a3584589c2..bfa5032fd6 100644
--- 
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/compose/script/e2e-springcloud-sync-compose.sh
+++ 
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/compose/script/e2e-springcloud-sync-compose.sh
@@ -33,13 +33,14 @@ docker network create -d bridge shenyu
 for sync in "${SYNC_ARRAY[@]}"; do
   echo -e "------------------\n"
   echo "[Start ${sync} synchronous] create shenyu-admin-${sync}.yml 
shenyu-bootstrap-${sync}.yml "
-  docker compose -f 
"$SHENYU_TESTCASE_DIR"/compose/sync/shenyu-sync-"${sync}"-eureka.yml up -d 
--quiet-pull
+  
SYNC_COMPOSE_FILE="$SHENYU_TESTCASE_DIR"/compose/sync/shenyu-sync-"${sync}"-eureka.yml
+  docker compose -f "$SYNC_COMPOSE_FILE" up -d --quiet-pull shenyu-mysql 
shenyu-admin || exit 1
+  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:31095/actuator/health || exit 1
+  docker compose -f "$SYNC_COMPOSE_FILE" up -d --quiet-pull shenyu-bootstrap 
|| exit 1
+  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:31195/actuator/health || exit 1
+  docker compose -f "${PRGDIR}"/shenyu-examples-springcloud-compose.yml up -d 
--quiet-pull || exit 1
   sleep 30s
-  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:31095/actuator/health
-  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:31195/actuator/health
-  docker compose -f "${PRGDIR}"/shenyu-examples-springcloud-compose.yml up -d 
--quiet-pull
-  sleep 30s
-  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:30884/actuator/health
+  sh "$SHENYU_TESTCASE_DIR"/k8s/script/healthcheck.sh 
http://localhost:30884/actuator/health || exit 1
   sleep 10s
   docker ps -a
 
@@ -62,16 +63,16 @@ for sync in "${SYNC_ARRAY[@]}"; do
     echo "------------------"
     echo "shenyu-admin log:"
     echo "------------------"
-    docker compose -f 
"$SHENYU_TESTCASE_DIR"/compose/sync/shenyu-sync-"${sync}".yml logs shenyu-admin
+    docker compose -f "$SYNC_COMPOSE_FILE" logs shenyu-admin
     echo "shenyu-bootstrap log:"
     echo "------------------"
-    docker compose -f 
"$SHENYU_TESTCASE_DIR"/compose/sync/shenyu-sync-"${sync}".yml logs 
shenyu-bootstrap
+    docker compose -f "$SYNC_COMPOSE_FILE" logs shenyu-bootstrap
     echo "shenyu-examples-springcloud log:"
     echo "------------------"
     docker compose -f "${PRGDIR}"/shenyu-examples-springcloud-compose.yml logs 
shenyu-examples-springcloud
     exit 1
   fi
-  docker compose -f 
"$SHENYU_TESTCASE_DIR"/compose/sync/shenyu-sync-"${sync}".yml down
+  docker compose -f "$SYNC_COMPOSE_FILE" down
   docker compose -f "${PRGDIR}"/shenyu-examples-springcloud-compose.yml down
   echo "[Remove ${sync} synchronous] delete shenyu-admin-${sync}.yml 
shenyu-bootstrap-${sync}.yml "
 done
diff --git 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
index 64e0851323..73b22f3184 100644
--- 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
+++ 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/client/RocketMQLogCollectClient.java
@@ -80,7 +80,6 @@ public class RocketMQLogCollectClient extends 
AbstractLogConsumeClient<RocketMQL
         try {
             producer.start();
             LOG.info("init RocketMQLogCollectClient success");
-            Runtime.getRuntime().addShutdownHook(new Thread(this::close));
         } catch (Exception e) {
             LOG.error("init RocketMQLogCollectClient error", e);
         }