[ISSUE alibaba#2293] Add clientID for warning log message in MQClient…

…Instance (alibaba#2294)
CST11021 · Sep 12, 2020 · 3eaabee · 3eaabee
1 parent 2f14aa5
commit 3eaabee
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
@@ -475,7 +475,7 @@ public void sendHeartbeatToAllBrokerWithLock() {
                 this.lockHeartbeat.unlock();
             }
         } else {
-            log.warn("lock heartBeat, but failed.");
+            log.warn("lock heartBeat, but failed. [{}]", this.clientId);
         }
     }
 
@@ -532,7 +532,7 @@ private void sendHeartbeatToAllBroker() {
         final boolean producerEmpty = heartbeatData.getProducerDataSet().isEmpty();
         final boolean consumerEmpty = heartbeatData.getConsumerDataSet().isEmpty();
         if (producerEmpty && consumerEmpty) {
-            log.warn("sending heartbeat, but no consumer and no producer");
+            log.warn("sending heartbeat, but no consumer and no producer. [{}]", this.clientId);
             return;
         }
 
@@ -668,7 +668,7 @@ public boolean updateTopicRouteInfoFromNameServer(final String topic, boolean is
                             return true;
                         }
                     } else {
-                        log.warn("updateTopicRouteInfoFromNameServer, getTopicRouteInfoFromNameServer return null, Topic: {}", topic);
+                        log.warn("updateTopicRouteInfoFromNameServer, getTopicRouteInfoFromNameServer return null, Topic: {}. [{}]", topic, this.clientId);
                     }
                 } catch (MQClientException e) {
                     if (!topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
@@ -681,7 +681,7 @@ public boolean updateTopicRouteInfoFromNameServer(final String topic, boolean is
                     this.lockNamesrv.unlock();
                 }
             } else {
-                log.warn("updateTopicRouteInfoFromNameServer tryLock timeout {}ms", LOCK_TIMEOUT_MILLIS);
+                log.warn("updateTopicRouteInfoFromNameServer tryLock timeout {}ms. [{}]", LOCK_TIMEOUT_MILLIS, this.clientId);
             }
         } catch (InterruptedException e) {
             log.warn("updateTopicRouteInfoFromNameServer Exception", e);
@@ -893,7 +893,7 @@ private void unregisterClientWithLock(final String producerGroup, final String c
                     this.lockHeartbeat.unlock();
                 }
             } else {
-                log.warn("lock heartBeat, but failed.");
+                log.warn("lock heartBeat, but failed. [{}]", this.clientId);
             }
         } catch (InterruptedException e) {
             log.warn("unregisterClientWithLock exception", e);