Repository: incubator-rocketmq Updated Branches: refs/heads/master b421d48c4 -> 920dd314d
Fix hard-coded topic/subscription config file path. Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/920dd314 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/920dd314 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/920dd314 Branch: refs/heads/master Commit: 920dd314d9e34cef01fdf2107b49b9d44336a69f Parents: b421d48 Author: Zhanhui Li <[email protected]> Authored: Wed Jan 4 15:35:45 2017 +0800 Committer: Zhanhui Li <[email protected]> Committed: Wed Jan 4 15:37:29 2017 +0800 ---------------------------------------------------------------------- .../rocketmq/broker/subscription/SubscriptionGroupManager.java | 4 ++-- .../org/apache/rocketmq/broker/topic/TopicConfigManager.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/920dd314/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java index 4b6072c..a9c978a 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java @@ -142,8 +142,8 @@ public class SubscriptionGroupManager extends ConfigManager { @Override public String configFilePath() { - //return BrokerPathConfigHelper.getSubscriptionGroupPath(this.brokerController.getMessageStoreConfig().getStorePathRootDir()); - return BrokerPathConfigHelper.getSubscriptionGroupPath(System.getProperty("user.home") + File.separator + "store"); + return BrokerPathConfigHelper.getSubscriptionGroupPath(this.brokerController.getMessageStoreConfig() + .getStorePathRootDir()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/920dd314/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java index d31ad4b..5ebf1e6 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java @@ -381,9 +381,8 @@ public class TopicConfigManager extends ConfigManager { @Override public String configFilePath() { -// return BrokerPathConfigHelper.getTopicConfigPath(this.brokerController.getMessageStoreConfig() -// .getStorePathRootDir()); - return BrokerPathConfigHelper.getTopicConfigPath(System.getProperty("user.home") + File.separator + "store"); + return BrokerPathConfigHelper.getTopicConfigPath(this.brokerController.getMessageStoreConfig() + .getStorePathRootDir()); } @Override
