From d4c146f30d74bab944f2a84996710b652f81125c Mon Sep 17 00:00:00 2001 From: qyang2 Date: Thu, 11 Jul 2019 11:06:16 +0800 Subject: [PATCH 1/2] add missing log --- .../org/apache/rocketmq/broker/BrokerStartup.java | 13 +++++-------- .../apache/rocketmq/namesrv/NamesrvController.java | 2 +- .../org/apache/rocketmq/namesrv/NamesrvStartup.java | 3 +-- .../processor/ClusterTestRequestProcessor.java | 2 +- .../java/org/apache/rocketmq/store/CommitLog.java | 1 + 5 files changed, 9 insertions(+), 12 deletions(-) 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 4b986c0d249..2f870863d39 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -71,10 +71,9 @@ public static BrokerController start(BrokerController controller) { } log.info(tip); - System.out.printf("%s%n", tip); return controller; } catch (Throwable e) { - e.printStackTrace(); + log.error("BrokerStartup fail to boot.", e); System.exit(-1); } @@ -143,7 +142,7 @@ public static BrokerController createBrokerController(String[] args) { MixAll.properties2Object(ServerUtil.commandLine2Properties(commandLine), brokerConfig); if (null == brokerConfig.getRocketmqHome()) { - System.out.printf("Please set the %s variable in your environment to match the location of the RocketMQ installation", MixAll.ROCKETMQ_HOME_ENV); + log.error("Please set the {} variable in your environment to match the location of the RocketMQ installation", MixAll.ROCKETMQ_HOME_ENV); System.exit(-2); } @@ -155,9 +154,7 @@ public static BrokerController createBrokerController(String[] args) { RemotingUtil.string2SocketAddress(addr); } } catch (Exception e) { - System.out.printf( - "The Name Server Address[%s] illegal, please set it as follows, \"127.0.0.1:9876;192.168.0.1:9876\"%n", - namesrvAddr); + log.error(String.format("The Name Server Address[%s] illegal, please set it as follows, \"127.0.0.1:9876;192.168.0.1:9876\"%%n", namesrvAddr), e); System.exit(-3); } } @@ -169,7 +166,7 @@ public static BrokerController createBrokerController(String[] args) { break; case SLAVE: if (brokerConfig.getBrokerId() <= 0) { - System.out.printf("Slave's brokerId must be > 0"); + log.error("Slave's brokerId must be > 0"); System.exit(-3); } @@ -242,7 +239,7 @@ public void run() { return controller; } catch (Throwable e) { - e.printStackTrace(); + log.error("createBrokerController occur an exception.", e); System.exit(-1); } 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 a6654f271c3..00b1fec775e 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvController.java @@ -134,7 +134,7 @@ private void reloadServerSslContext() { } }); } catch (Exception e) { - log.warn("FileWatchService created error, can't load the certificate dynamically"); + log.warn("FileWatchService created error, can't load the certificate dynamically", e); } } 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 9b49567f322..2ebc76325e9 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -58,10 +58,9 @@ public static NamesrvController main0(String[] args) { start(controller); String tip = "The Name Server boot success. serializeType=" + RemotingCommand.getSerializeTypeConfigInThisServer(); log.info(tip); - System.out.printf("%s%n", tip); return controller; } catch (Throwable e) { - e.printStackTrace(); + log.error("The Name Server fail to boot.", e); System.exit(-1); } diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java index a58a3b97fc2..088dcb22407 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java @@ -66,7 +66,7 @@ public RemotingCommand getRouteInfoByTopic(ChannelHandlerContext ctx, try { topicRouteData = adminExt.examineTopicRouteInfo(requestHeader.getTopic()); } catch (Exception e) { - log.info("get route info by topic from product environment failed. envName={},", productEnvName); + log.error("get route info by topic from product environment failed. envName=" + productEnvName, e); } } diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java index cbcc1a7b728..35ba1ec72f7 100644 --- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java +++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java @@ -367,6 +367,7 @@ public DispatchRequest checkMessageAndReturnSize(java.nio.ByteBuffer byteBuffer, propertiesMap ); } catch (Exception e) { + log.error("an exception occur in method of checkMessageAndReturnSize", e); } return new DispatchRequest(-1, false /* success */); From eabc8bbb310e0d820776f306ebff0351d5976e38 Mon Sep 17 00:00:00 2001 From: qyang2 Date: Tue, 23 Jul 2019 15:12:18 +0800 Subject: [PATCH 2/2] add log --- .../src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 1 + .../main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 1 + 2 files changed, 2 insertions(+) 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 2f870863d39..7d38f5d135c 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -239,6 +239,7 @@ public void run() { return controller; } catch (Throwable e) { + e.printStackTrace(); log.error("createBrokerController occur an exception.", e); System.exit(-1); } 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 2ebc76325e9..1e4cb87ffbd 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -60,6 +60,7 @@ public static NamesrvController main0(String[] args) { log.info(tip); return controller; } catch (Throwable e) { + e.printStackTrace(); log.error("The Name Server fail to boot.", e); System.exit(-1); }