From 37223cac73e828b4847bc86397abe03fb9ed7e8c Mon Sep 17 00:00:00 2001 From: ymwneu Date: Fri, 2 Nov 2018 22:26:29 +0800 Subject: [PATCH] [ISSUE #512]Bugfix for option -p can not print config items when using admin tool (#514) --- .../java/org/apache/rocketmq/common/constant/LoggerName.java | 1 + distribution/conf/logback_namesrv.xml | 5 +++++ .../java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) 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 12070ddc..fe0ae9f1 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 @@ -19,6 +19,7 @@ package org.apache.rocketmq.common.constant; public class LoggerName { public static final String FILTERSRV_LOGGER_NAME = "RocketmqFiltersrv"; public static final String NAMESRV_LOGGER_NAME = "RocketmqNamesrv"; + public static final String NAMESRV_CONSOLE_NAME = "RocketmqNamesrvConsole"; public static final String BROKER_LOGGER_NAME = "RocketmqBroker"; public static final String BROKER_CONSOLE_NAME = "RocketmqConsole"; public static final String CLIENT_LOGGER_NAME = "RocketmqClient"; diff --git a/distribution/conf/logback_namesrv.xml b/distribution/conf/logback_namesrv.xml index 53288945..36eda680 100644 --- a/distribution/conf/logback_namesrv.xml +++ b/distribution/conf/logback_namesrv.xml @@ -82,6 +82,11 @@ + + + + + diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index 24e7c263..9b49567f 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -99,8 +99,9 @@ public class NamesrvStartup { } if (commandLine.hasOption('p')) { - MixAll.printObjectProperties(null, namesrvConfig); - MixAll.printObjectProperties(null, nettyServerConfig); + InternalLogger console = InternalLoggerFactory.getLogger(LoggerName.NAMESRV_CONSOLE_NAME); + MixAll.printObjectProperties(console, namesrvConfig); + MixAll.printObjectProperties(console, nettyServerConfig); System.exit(0); } -- GitLab