You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/12/18 06:50:52 UTC

[rocketmq] 01/02: Add log when reload the ssl context

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

yukon pushed a commit to branch enhancedTls
in repository https://gitbox.apache.org/repos/asf/rocketmq.git

commit dd2339bd38f781d9f74204ac3db24e773264ac7c
Author: yukon <yu...@apache.org>
AuthorDate: Sun Dec 17 20:22:24 2017 +0800

    Add log when reload the ssl context
---
 .../src/main/java/org/apache/rocketmq/broker/BrokerController.java   | 5 +++--
 .../src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 9a3a56a..8891bd3 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -406,6 +406,7 @@ public class BrokerController {
                             @Override
                             public void onChanged(String path) {
                                 if (path.equals(TlsSystemConfig.tlsServerTrustCertPath)) {
+                                    log.info("The trust certificate changed, reload the ssl context");
                                     reloadServerSslContext();
                                 }
                                 if (path.equals(TlsSystemConfig.tlsServerCertPath)) {
@@ -415,8 +416,8 @@ public class BrokerController {
                                     keyChanged = true;
                                 }
                                 if (certChanged && keyChanged) {
-                                    certChanged = false;
-                                    keyChanged = false;
+                                    log.info("The certificate and private key changed, reload the ssl context");
+                                    certChanged = keyChanged = false;
                                     reloadServerSslContext();
                                 }
                             }
diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
index 844175c..2ed599c 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java
@@ -113,6 +113,7 @@ public class NamesrvController {
                         @Override
                         public void onChanged(String path) {
                             if (path.equals(TlsSystemConfig.tlsServerTrustCertPath)) {
+                                log.info("The trust certificate changed, reload the ssl context");
                                 reloadServerSslContext();
                             }
                             if (path.equals(TlsSystemConfig.tlsServerCertPath)) {
@@ -122,8 +123,8 @@ public class NamesrvController {
                                 keyChanged = true;
                             }
                             if (certChanged && keyChanged) {
-                                certChanged = false;
-                                keyChanged = false;
+                                log.info("The certificate and private key changed, reload the ssl context");
+                                certChanged = keyChanged = false;
                                 reloadServerSslContext();
                             }
                         }

-- 
To stop receiving notification emails like this one, please contact
"commits@rocketmq.apache.org" <co...@rocketmq.apache.org>.