From fc5180e6b11a2c5abe7f1c181b65dac8eb032352 Mon Sep 17 00:00:00 2001 From: zhangjidi Date: Wed, 15 Sep 2021 16:33:56 +0800 Subject: [PATCH] isolate broker's log can be configured --- .../java/org/apache/rocketmq/broker/BrokerStartup.java | 7 +++++-- .../java/org/apache/rocketmq/common/BrokerConfig.java | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index 84243c907b..bb2eb9135a 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -187,8 +187,11 @@ public class BrokerStartup { JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); - System.setProperty("brokerLogDir", brokerConfig.getBrokerName() + "_" + brokerConfig.getBrokerId()); - if (messageStoreConfig.isEnableDLegerCommitLog()) { + System.setProperty("brokerLogDir", ""); + if (brokerConfig.isIsolateLogEnable()) { + System.setProperty("brokerLogDir", brokerConfig.getBrokerName() + "_" + brokerConfig.getBrokerId()); + } + if (brokerConfig.isIsolateLogEnable() && messageStoreConfig.isEnableDLegerCommitLog()) { System.setProperty("brokerLogDir", brokerConfig.getBrokerName() + "_" + messageStoreConfig.getdLegerSelfId()); } configurator.doConfigure(brokerConfig.getRocketmqHome() + "/conf/logback_broker.xml"); diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java index f710cdb403..a6169d74d1 100644 --- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java +++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java @@ -187,6 +187,8 @@ public class BrokerConfig { private boolean autoDeleteUnusedStats = false; + private boolean isolateLogEnable = false; + public static String localHostName() { try { return InetAddress.getLocalHost().getHostName(); @@ -804,4 +806,12 @@ public class BrokerConfig { public void setAutoDeleteUnusedStats(boolean autoDeleteUnusedStats) { this.autoDeleteUnusedStats = autoDeleteUnusedStats; } + + public boolean isIsolateLogEnable() { + return isolateLogEnable; + } + + public void setIsolateLogEnable(boolean isolateLogEnable) { + this.isolateLogEnable = isolateLogEnable; + } }