From cc2eb5c3c892e6967f6aa9818b8a50f489ae7e00 Mon Sep 17 00:00:00 2001
From: Toyas <toyasovo@gmail.com>
Date: Thu, 12 Mar 2026 17:33:14 +0800
Subject: [PATCH] fix(config): Improve Redis logging and RocketMQ health checks

---
 config/redis/sentinel.conf | 3 ++-
 docker-compose-node-01.yml | 5 +++--
 docker-compose-node-02.yml | 5 +++--
 docker-compose-node-03.yml | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/redis/sentinel.conf b/config/redis/sentinel.conf
index e2f9208..bd68619 100644
--- a/config/redis/sentinel.conf
+++ b/config/redis/sentinel.conf
@@ -4,7 +4,8 @@
 port 26379
 daemonize no
 pidfile /var/run/redis/redis-sentinel.pid
-logfile /var/log/redis/redis-sentinel.log
+# 日志输出到标准输出（Docker容器标准做法）
+logfile ""
 dir /tmp
 
 # 监控主节点配置
diff --git a/docker-compose-node-01.yml b/docker-compose-node-01.yml
index d674960..372f796 100644
--- a/docker-compose-node-01.yml
+++ b/docker-compose-node-01.yml
@@ -120,10 +120,11 @@ services:
       - JAVA_OPT_EXT=-server -Xms256m -Xmx256m
     command: sh mqnamesrv
     healthcheck:
-      test: ["CMD", "sh", "-c", "nc -z localhost 9876"]
+      test: ["CMD-SHELL", "test -f /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log && grep -q 'boot success' /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log || exit 1"]
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 10
+      start_period: 30s
     networks:
       - ha-network
 
diff --git a/docker-compose-node-02.yml b/docker-compose-node-02.yml
index 4cf2910..8419b42 100644
--- a/docker-compose-node-02.yml
+++ b/docker-compose-node-02.yml
@@ -120,10 +120,11 @@ services:
       - JAVA_OPT_EXT=-server -Xms256m -Xmx256m
     command: sh mqnamesrv
     healthcheck:
-      test: ["CMD", "sh", "-c", "nc -z localhost 9876"]
+      test: ["CMD-SHELL", "test -f /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log && grep -q 'boot success' /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log || exit 1"]
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 10
+      start_period: 30s
     networks:
       - ha-network
 
diff --git a/docker-compose-node-03.yml b/docker-compose-node-03.yml
index 7370d08..1279b2e 100644
--- a/docker-compose-node-03.yml
+++ b/docker-compose-node-03.yml
@@ -121,10 +121,11 @@ services:
       - JAVA_OPT_EXT=-server -Xms256m -Xmx256m
     command: sh mqnamesrv
     healthcheck:
-      test: ["CMD", "sh", "-c", "nc -z localhost 9876"]
+      test: ["CMD-SHELL", "test -f /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log && grep -q 'boot success' /home/rocketmq/logs/rocketmqlogs/nameservicedefault.log || exit 1"]
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 10
+      start_period: 30s
     networks:
       - ha-network