diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java index 961e062bb548e075c46832b75a693b83701f1e38..87120178368b1d07155701cf0b35763966cd0c82 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java @@ -161,7 +161,7 @@ public class ConsumeMessageConcurrentlyService implements ConsumeMessageService final long beginTime = System.currentTimeMillis(); - log.info("consumeMessageDirectly receive new messge: {}", msg); + log.info("consumeMessageDirectly receive new message: {}", msg); try { ConsumeConcurrentlyStatus status = this.messageListener.consumeMessage(msgs, context); diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java index 27b02da3bbcd4e0407f070605b3e76fad1ca1054..43199e5b28c90b807cfcd2f660f21925161494eb 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java @@ -144,7 +144,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService { final long beginTime = System.currentTimeMillis(); - log.info("consumeMessageDirectly receive new messge: {}", msg); + log.info("consumeMessageDirectly receive new message: {}", msg); try { ConsumeOrderlyStatus status = this.messageListener.consumeMessage(msgs, context); diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java index d78ec95f909dc2843628c8042a5b6c0d5066655a..109d3e810ec9279b19f79c22dd73a8effb1d2c89 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java @@ -152,7 +152,7 @@ public class RouteInfoManager { channel, haServerAddr)); if (null == prevBrokerLiveInfo) { - log.info("new broker registerd, {} HAServer: {}", brokerAddr, haServerAddr); + log.info("new broker registered, {} HAServer: {}", brokerAddr, haServerAddr); } if (filterServerList != null) { @@ -205,7 +205,7 @@ public class RouteInfoManager { queueDataList = new LinkedList(); queueDataList.add(queueData); this.topicQueueTable.put(topicConfig.getTopicName(), queueDataList); - log.info("new topic registerd, {} {}", topicConfig.getTopicName(), queueData); + log.info("new topic registered, {} {}", topicConfig.getTopicName(), queueData); } else { boolean addNewOne = true; 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 edd68a58420328dc2f20b44f2967b30badf9c43e..03d98d31925ed92e060eba0fc1087e1610877bd4 100644 --- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java +++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java @@ -185,7 +185,7 @@ public class CommitLog { index++; if (index >= mappedFiles.size()) { // Current branch can not happen - log.info("recover last 3 physics file over, last maped file " + mappedFile.getFileName()); + log.info("recover last 3 physics file over, last mapped file " + mappedFile.getFileName()); break; } else { mappedFile = mappedFiles.get(index); @@ -403,7 +403,7 @@ public class CommitLog { for (; index >= 0; index--) { mappedFile = mappedFiles.get(index); if (this.isMappedFileMatchedRecover(mappedFile)) { - log.info("recover from this maped file " + mappedFile.getFileName()); + log.info("recover from this mapped file " + mappedFile.getFileName()); break; } } @@ -445,7 +445,7 @@ public class CommitLog { if (index >= mappedFiles.size()) { // The current branch under normal circumstances should // not happen - log.info("recover physics file over, last maped file " + mappedFile.getFileName()); + log.info("recover physics file over, last mapped file " + mappedFile.getFileName()); break; } else { mappedFile = mappedFiles.get(index); @@ -571,7 +571,7 @@ public class CommitLog { mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise } if (null == mappedFile) { - log.error("create maped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); + log.error("create mapped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); beginTimeInLock = 0; return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null); } @@ -586,7 +586,7 @@ public class CommitLog { mappedFile = this.mappedFileQueue.getLastMappedFile(0); if (null == mappedFile) { // XXX: warn and notify me - log.error("create maped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); + log.error("create mapped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); beginTimeInLock = 0; return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result); } @@ -721,7 +721,7 @@ public class CommitLog { mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise } if (null == mappedFile) { - log.error("Create maped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); + log.error("Create mapped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); beginTimeInLock = 0; return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null); } @@ -736,7 +736,7 @@ public class CommitLog { mappedFile = this.mappedFileQueue.getLastMappedFile(0); if (null == mappedFile) { // XXX: warn and notify me - log.error("Create maped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); + log.error("Create mapped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); beginTimeInLock = 0; return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result); } diff --git a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java index 4922e3d97b5af4ba75a4b99577035b6a437710e3..09807c36e1292e0185d2fd655c7263140b1cb64f 100644 --- a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java +++ b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java @@ -121,7 +121,7 @@ public class ConsumeQueue { index++; if (index >= mappedFiles.size()) { - log.info("recover last consume queue file over, last maped file " + log.info("recover last consume queue file over, last mapped file " + mappedFile.getFileName()); break; } else {