This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new f4e2a4a0e3 [ISSUE #9335] Use MixAll.ROCKETMQ_HOME_DIR for home
directory (#9474)
f4e2a4a0e3 is described below
commit f4e2a4a0e3c34641ba16cc79e60b33498049da23
Author: WJ66880 <1021329...@qq.com>
AuthorDate: Wed Jun 18 10:28:35 2025 +0800
[ISSUE #9335] Use MixAll.ROCKETMQ_HOME_DIR for home directory (#9474)
---
.../org/apache/rocketmq/auth/migration/v1/PlainPermissionManager.java | 3 +--
common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java | 2 +-
common/src/main/java/org/apache/rocketmq/common/ControllerConfig.java | 2 +-
common/src/main/java/org/apache/rocketmq/common/MixAll.java | 4 ++++
.../main/java/org/apache/rocketmq/common/namesrv/NamesrvConfig.java | 2 +-
.../java/org/apache/rocketmq/container/BrokerContainerConfig.java | 2 +-
.../java/org/apache/rocketmq/proxy/config/ConfigurationManager.java | 2 +-
.../apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java | 3 +--
.../main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java | 3 +--
9 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/auth/src/main/java/org/apache/rocketmq/auth/migration/v1/PlainPermissionManager.java
b/auth/src/main/java/org/apache/rocketmq/auth/migration/v1/PlainPermissionManager.java
index 7882859261..569af10c18 100644
---
a/auth/src/main/java/org/apache/rocketmq/auth/migration/v1/PlainPermissionManager.java
+++
b/auth/src/main/java/org/apache/rocketmq/auth/migration/v1/PlainPermissionManager.java
@@ -38,8 +38,7 @@ public class PlainPermissionManager {
private static final Logger log =
LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME);
- private String fileHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
- System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private String fileHome = MixAll.ROCKETMQ_HOME_DIR;
private String defaultAclDir;
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 b607985e34..3d0feec8a7 100644
--- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
@@ -30,7 +30,7 @@ public class BrokerConfig extends BrokerIdentity {
private String brokerConfigPath = null;
- private String rocketmqHome =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private String rocketmqHome = MixAll.ROCKETMQ_HOME_DIR;
@ImportantField
private String namesrvAddr =
System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY,
System.getenv(MixAll.NAMESRV_ADDR_ENV));
diff --git
a/common/src/main/java/org/apache/rocketmq/common/ControllerConfig.java
b/common/src/main/java/org/apache/rocketmq/common/ControllerConfig.java
index 85606fc5ee..671fe94d77 100644
--- a/common/src/main/java/org/apache/rocketmq/common/ControllerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/ControllerConfig.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
import org.apache.rocketmq.common.metrics.MetricsExporterType;
public class ControllerConfig {
- private String rocketmqHome =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private String rocketmqHome = MixAll.ROCKETMQ_HOME_DIR;
private String configStorePath = System.getProperty("user.home") +
File.separator + "controller" + File.separator + "controller.properties";
public static final String DLEDGER_CONTROLLER = "DLedger";
public static final String JRAFT_CONTROLLER = "jRaft";
diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
index d63906e216..2c298b240c 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
@@ -57,6 +57,10 @@ import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
public class MixAll {
public static final String ROCKETMQ_HOME_ENV = "ROCKETMQ_HOME";
public static final String ROCKETMQ_HOME_PROPERTY = "rocketmq.home.dir";
+ /**
+ * unify the home dir
+ */
+ public static final String ROCKETMQ_HOME_DIR =
System.getProperty(ROCKETMQ_HOME_PROPERTY, System.getenv(ROCKETMQ_HOME_ENV));
public static final String NAMESRV_ADDR_ENV = "NAMESRV_ADDR";
public static final String NAMESRV_ADDR_PROPERTY = "rocketmq.namesrv.addr";
public static final String MESSAGE_COMPRESS_TYPE =
"rocketmq.message.compressType";
diff --git
a/common/src/main/java/org/apache/rocketmq/common/namesrv/NamesrvConfig.java
b/common/src/main/java/org/apache/rocketmq/common/namesrv/NamesrvConfig.java
index d1cdc7631c..ab81937391 100644
--- a/common/src/main/java/org/apache/rocketmq/common/namesrv/NamesrvConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/namesrv/NamesrvConfig.java
@@ -25,7 +25,7 @@ import org.apache.rocketmq.common.MixAll;
public class NamesrvConfig {
- private String rocketmqHome =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private String rocketmqHome = MixAll.ROCKETMQ_HOME_DIR;
private String kvConfigPath = System.getProperty("user.home") +
File.separator + "namesrv" + File.separator + "kvConfig.json";
private String configStorePath = System.getProperty("user.home") +
File.separator + "namesrv" + File.separator + "namesrv.properties";
private String productEnvName = "center";
diff --git
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerConfig.java
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerConfig.java
index 03b4b263f9..6be0b807d6 100644
---
a/container/src/main/java/org/apache/rocketmq/container/BrokerContainerConfig.java
+++
b/container/src/main/java/org/apache/rocketmq/container/BrokerContainerConfig.java
@@ -23,7 +23,7 @@ import org.apache.rocketmq.common.utils.NetworkUtil;
public class BrokerContainerConfig {
- private String rocketmqHome =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private String rocketmqHome = MixAll.ROCKETMQ_HOME_DIR;
@ImportantField
private String namesrvAddr =
System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY,
System.getenv(MixAll.NAMESRV_ADDR_ENV));
diff --git
a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ConfigurationManager.java
b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ConfigurationManager.java
index 24e1bd44b4..0d8c60931d 100644
---
a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ConfigurationManager.java
+++
b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ConfigurationManager.java
@@ -25,7 +25,7 @@ import org.apache.rocketmq.common.MixAll;
public class ConfigurationManager {
public static final String RMQ_PROXY_HOME = "RMQ_PROXY_HOME";
- protected static final String DEFAULT_RMQ_PROXY_HOME =
System.getenv(MixAll.ROCKETMQ_HOME_ENV);
+ protected static final String DEFAULT_RMQ_PROXY_HOME =
MixAll.ROCKETMQ_HOME_DIR;
protected static String proxyHome;
protected static Configuration configuration;
diff --git
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
index d0c0dd6e65..78a331e775 100644
---
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
+++
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/DefaultMessagingProcessor.java
@@ -74,8 +74,7 @@ public class DefaultMessagingProcessor extends
AbstractStartAndShutdown implemen
protected ThreadPoolExecutor producerProcessorExecutor;
protected ThreadPoolExecutor consumerProcessorExecutor;
- protected static final String ROCKETMQ_HOME =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
- System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ protected static final String ROCKETMQ_HOME = MixAll.ROCKETMQ_HOME_DIR;
protected DefaultMessagingProcessor(ServiceManager serviceManager) {
ProxyConfig proxyConfig = ConfigurationManager.getProxyConfig();
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
index b5caf06908..b210e82b3c 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
@@ -121,8 +121,7 @@ import java.util.List;
public class MQAdminStartup {
protected static final List<SubCommand> SUB_COMMANDS = new ArrayList<>();
- private static final String ROCKETMQ_HOME =
System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY,
- System.getenv(MixAll.ROCKETMQ_HOME_ENV));
+ private static final String ROCKETMQ_HOME = MixAll.ROCKETMQ_HOME_DIR;
public static void main(String[] args) {
main0(args, null);
