From 633eca2665edca4999b28f3f57857649d821c52c Mon Sep 17 00:00:00 2001 From: qianzhenyu <122274659@qq.com> Date: Mon, 9 Jan 2017 16:54:31 +0800 Subject: [PATCH 1/2] Fix-37 [ROCKETMQ-37] Log output information is not accurate --- .../rocketmq/broker/subscription/SubscriptionGroupManager.java | 2 +- .../java/org/apache/rocketmq/client/impl/MQClientManager.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 92dc5e72b25..bdf2a01efea 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 @@ -184,7 +184,7 @@ public void deleteSubscriptionGroupConfig(final String groupName) { this.dataVersion.nextVersion(); this.persist(); } else { - log.warn("delete subscription group failed, subscription group: {} not exist", old); + log.warn("delete subscription group failed, subscription groupName: {} not exist", groupName); } } } diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java index 6f2c9a38d60..e2dcb728d00 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java @@ -53,8 +53,9 @@ public MQClientInstance getAndCreateMQClientInstance(final ClientConfig clientCo MQClientInstance prev = this.factoryTable.putIfAbsent(clientId, instance); if (prev != null) { instance = prev; - } else { log.warn("Previous MQClientInstance has created for clientId:[{}]", clientId); + } else { + log.info("new MQClientInstance has created for clientId:[{}]", clientId); } } From fe8a7a82750c9525e9cd40f8664684b470d63bdb Mon Sep 17 00:00:00 2001 From: qianzhenyu <122274659@qq.com> Date: Mon, 16 Jan 2017 11:14:01 +0800 Subject: [PATCH 2/2] Fix-37 [ROCKETMQ-37] Using active tune for log output --- .../java/org/apache/rocketmq/client/impl/MQClientManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java index e2dcb728d00..f596b8365e7 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientManager.java @@ -53,9 +53,9 @@ public MQClientInstance getAndCreateMQClientInstance(final ClientConfig clientCo MQClientInstance prev = this.factoryTable.putIfAbsent(clientId, instance); if (prev != null) { instance = prev; - log.warn("Previous MQClientInstance has created for clientId:[{}]", clientId); + log.warn("Returned Previous MQClientInstance for clientId:[{}]", clientId); } else { - log.info("new MQClientInstance has created for clientId:[{}]", clientId); + log.info("Created new MQClientInstance for clientId:[{}]", clientId); } }