From 85fffff8cb14ed7b3ff5beeece0e36d3c887fe09 Mon Sep 17 00:00:00 2001
From: Async <raisinata@foxmail.com>
Date: Wed, 11 Jun 2025 18:57:30 +0800
Subject: [PATCH] refactor(proxy): Make TLS certificate watch interval
 configurable

Signed-off-by: Async <raisinata@foxmail.com>
---
 .../org/apache/rocketmq/proxy/config/ProxyConfig.java    | 9 +++++++++
 .../proxy/service/cert/TlsCertificateManager.java        | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
index e3e60b76bb5..a99b0afc352 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
@@ -83,6 +83,7 @@ public class ProxyConfig implements ConfigFile {
     private boolean tlsTestModeEnable = true;
     private String tlsKeyPath = ConfigurationManager.getProxyHome() + "/conf/tls/rocketmq.key";
     private String tlsCertPath = ConfigurationManager.getProxyHome() + "/conf/tls/rocketmq.crt";
+    private int tlsCertWatchIntervalMs = 60 * 60 * 1000; // 1 hour
     /**
      * gRPC
      */
@@ -325,6 +326,14 @@ public void parseDelayLevel() {
         }
     }
 
+    public int getTlsCertWatchIntervalMs() {
+        return tlsCertWatchIntervalMs;
+    }
+
+    public void setTlsCertWatchIntervalMs(int tlsCertWatchIntervalMs) {
+        this.tlsCertWatchIntervalMs = tlsCertWatchIntervalMs;
+    }
+
     public String getRocketMQClusterName() {
         return rocketMQClusterName;
     }
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManager.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManager.java
index 0e6f43baa37..2ab4f31b6ed 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManager.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManager.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.rocketmq.proxy.service.cert;
+
 import org.apache.rocketmq.common.constant.LoggerName;
 import org.apache.rocketmq.common.utils.StartAndShutdown;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
@@ -39,7 +40,7 @@ public TlsCertificateManager() {
                     ConfigurationManager.getProxyConfig().getTlsKeyPath()
                 },
                 new CertKeyFileWatchListener(),
-                60 * 60 * 1000 /* 1 hour */
+                ConfigurationManager.getProxyConfig().getTlsCertWatchIntervalMs()
             );
         } catch (Exception e) {
             log.error("Failed to initialize TLS certificate watch service", e);
@@ -107,7 +108,7 @@ private void notifyContextReload() {
             for (TlsContextReloadListener listener : reloadListeners) {
                 try {
                     listener.onTlsContextReload();
-                } catch (Exception e) {
+                } catch (Throwable e) {
                     log.error("Failed to notify TLS context reload to listener: " + listener, e);
                 }
             }