[ROCKETMQ-178] Fix -p -m options closes apache/incubator-rocketmq#93
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/42826c41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/42826c41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/42826c41 Branch: refs/heads/release-4.1.0-incubating Commit: 42826c4115d91ee48512df288b6fe3822af73f06 Parents: c0fe02e Author: Li Zhanhui <lizhan...@apache.org> Authored: Fri May 26 14:42:23 2017 +0800 Committer: dongeforever <zhendongli...@yeah.net> Committed: Fri May 26 14:42:23 2017 +0800 ---------------------------------------------------------------------- .../apache/rocketmq/broker/BrokerStartup.java | 32 +++++++++++--------- .../rocketmq/common/constant/LoggerName.java | 1 + distribution/conf/logback_broker.xml | 5 +++ 3 files changed, 23 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/42826c41/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 98ff136..85d2e3a 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -103,20 +103,6 @@ public class BrokerStartup { messageStoreConfig.setAccessMessageInMemoryMaxRatio(ratio); } - if (commandLine.hasOption('p')) { - MixAll.printObjectProperties(null, brokerConfig); - MixAll.printObjectProperties(null, nettyServerConfig); - MixAll.printObjectProperties(null, nettyClientConfig); - MixAll.printObjectProperties(null, messageStoreConfig); - System.exit(0); - } else if (commandLine.hasOption('m')) { - MixAll.printObjectProperties(null, brokerConfig, true); - MixAll.printObjectProperties(null, nettyServerConfig, true); - MixAll.printObjectProperties(null, nettyClientConfig, true); - MixAll.printObjectProperties(null, messageStoreConfig, true); - System.exit(0); - } - if (commandLine.hasOption('c')) { String file = commandLine.getOptionValue('c'); if (file != null) { @@ -181,8 +167,24 @@ public class BrokerStartup { configurator.setContext(lc); lc.reset(); configurator.doConfigure(brokerConfig.getRocketmqHome() + "/conf/logback_broker.xml"); - log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); + if (commandLine.hasOption('p')) { + Logger console = LoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME); + MixAll.printObjectProperties(console, brokerConfig); + MixAll.printObjectProperties(console, nettyServerConfig); + MixAll.printObjectProperties(console, nettyClientConfig); + MixAll.printObjectProperties(console, messageStoreConfig); + System.exit(0); + } else if (commandLine.hasOption('m')) { + Logger console = LoggerFactory.getLogger(LoggerName.BROKER_CONSOLE_NAME); + MixAll.printObjectProperties(console, brokerConfig, true); + MixAll.printObjectProperties(console, nettyServerConfig, true); + MixAll.printObjectProperties(console, nettyClientConfig, true); + MixAll.printObjectProperties(console, messageStoreConfig, true); + System.exit(0); + } + + log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); MixAll.printObjectProperties(log, brokerConfig); MixAll.printObjectProperties(log, nettyServerConfig); MixAll.printObjectProperties(log, nettyClientConfig); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/42826c41/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java index 385c121..12070dd 100644 --- a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java +++ b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java @@ -20,6 +20,7 @@ public class LoggerName { public static final String FILTERSRV_LOGGER_NAME = "RocketmqFiltersrv"; public static final String NAMESRV_LOGGER_NAME = "RocketmqNamesrv"; public static final String BROKER_LOGGER_NAME = "RocketmqBroker"; + public static final String BROKER_CONSOLE_NAME = "RocketmqConsole"; public static final String CLIENT_LOGGER_NAME = "RocketmqClient"; public static final String TOOLS_LOGGER_NAME = "RocketmqTools"; public static final String COMMON_LOGGER_NAME = "RocketmqCommon"; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/42826c41/distribution/conf/logback_broker.xml ---------------------------------------------------------------------- diff --git a/distribution/conf/logback_broker.xml b/distribution/conf/logback_broker.xml index dd5c63f..3945fac 100644 --- a/distribution/conf/logback_broker.xml +++ b/distribution/conf/logback_broker.xml @@ -349,6 +349,11 @@ <appender-ref ref="RocketmqFilterAppender"/> </logger> + <logger name="RocketmqConsole" additivity="false"> + <level value="INFO" /> + <appender-ref ref="STDOUT" /> + </logger> + <root> <level value="INFO"/> <appender-ref ref="DefaultAppender"/>