Repository: incubator-rocketmq Updated Branches: refs/heads/master ef71e62ac -> ee33564d6
Extract Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/ddcbf765 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/ddcbf765 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/ddcbf765 Branch: refs/heads/master Commit: ddcbf765ecad7296961619fe155f10b13162f52f Parents: 881aef5 Author: vongosling <[email protected]> Authored: Mon Jan 23 15:20:10 2017 +0800 Committer: vongosling <[email protected]> Committed: Mon Jan 23 15:20:10 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 2 +- common/src/main/java/org/apache/rocketmq/common/MixAll.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/ddcbf765/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java ---------------------------------------------------------------------- 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 5b15d79..f613894 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -234,7 +234,7 @@ public class BrokerStartup { if (properties == null) { return; } - String rmqAddressServerDomain = properties.getProperty("rmqAddressServerDomain", "jmenv.tbsite.net"); + String rmqAddressServerDomain = properties.getProperty("rmqAddressServerDomain", MixAll.DEFAULT_NAMESRV_ADDR_LOOKUP); String rmqAddressServerSubGroup = properties.getProperty("rmqAddressServerSubGroup", "nsaddr"); System.setProperty("rocketmq.namesrv.domain", rmqAddressServerDomain); System.setProperty("rocketmq.namesrv.domain.subgroup", rmqAddressServerSubGroup); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/ddcbf765/common/src/main/java/org/apache/rocketmq/common/MixAll.java ---------------------------------------------------------------------- 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 22ed96a..cbb395a 100644 --- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java +++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java @@ -52,7 +52,8 @@ public class MixAll { 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_LEVEL = "rocketmq.message.compressLevel"; - public static final String WS_DOMAIN_NAME = System.getProperty("rocketmq.namesrv.domain", "jmenv.tbsite.net"); + public static final String DEFAULT_NAMESRV_ADDR_LOOKUP = "jmenv.tbsite.net"; + public static final String WS_DOMAIN_NAME = System.getProperty("rocketmq.namesrv.domain", DEFAULT_NAMESRV_ADDR_LOOKUP); public static final String WS_DOMAIN_SUBGROUP = System.getProperty("rocketmq.namesrv.domain.subgroup", "nsaddr"); // http://jmenv.tbsite.net:8080/rocketmq/nsaddr public static final String WS_ADDR = "http://"; + WS_DOMAIN_NAME + ":8080/rocketmq/" + WS_DOMAIN_SUBGROUP;
