zhouxinyu closed pull request #232: fix "sh bin/mqnamesrv -p" no print config item URL: https://github.com/apache/rocketmq/pull/232
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): 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 12070ddc3..132161e89 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 @@ 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 = "RocketmqConsole"; 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 53288945b..5d61e895a 100644 --- a/distribution/conf/logback_namesrv.xml +++ b/distribution/conf/logback_namesrv.xml @@ -82,6 +82,11 @@ <appender-ref ref="RocketmqNamesrvAppender"/> </logger> + <logger name="RocketmqConsole" additivity="false"> + <level value="INFO"/> + <appender-ref ref="STDOUT"/> + </logger> + <root> <level value="INFO"/> <appender-ref ref="DefaultAppender"/> diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java index 51b20b416..77a36215b 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java @@ -58,6 +58,8 @@ public NamesrvController(NamesrvConfig namesrvConfig, NettyServerConfig nettyServerConfig) { this.namesrvConfig = namesrvConfig; this.nettyServerConfig = nettyServerConfig; + + // namesrv?????? this.kvConfigManager = new KVConfigManager(this); this.routeInfoManager = new RouteInfoManager(); this.brokerHousekeepingService = new BrokerHousekeepingService(this); @@ -79,6 +81,9 @@ public boolean initialize() { this.registerProcessor(); + /* + * ???????????broker + */ this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() { @Override 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 0a0c6562d..8db12e3ce 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -47,6 +47,7 @@ public static void main(String[] args) { } public static NamesrvController main0(String[] args) { + // rocketmq???? System.setProperty(RemotingCommand.REMOTING_VERSION_KEY, Integer.toString(MQVersion.CURRENT_VERSION)); try { //PackageConflictDetect.detectFastjson(); @@ -78,8 +79,9 @@ public static NamesrvController main0(String[] args) { } if (commandLine.hasOption('p')) { - MixAll.printObjectProperties(null, namesrvConfig); - MixAll.printObjectProperties(null, nettyServerConfig); + Logger console = LoggerFactory.getLogger(LoggerName.NAMESRV_CONSOLE_NAME); + MixAll.printObjectProperties(console, namesrvConfig); + MixAll.printObjectProperties(console, nettyServerConfig); System.exit(0); } diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java index cd6ed4704..c805b4ced 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java @@ -99,6 +99,7 @@ public NettyRemotingServer(final NettyServerConfig nettyServerConfig, publicThreadNums = 4; } + // ?????????????????? this.publicExecutor = Executors.newFixedThreadPool(publicThreadNums, new ThreadFactory() { private AtomicInteger threadIndex = new AtomicInteger(0); ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services