opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-31 02:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX admin subcommand consumeMessage can pull message with timestamp greater then now (#380)

Browse Source
This commit is contained in:
XiaoZYang
2018-07-23 23:09:26 +08:00
committed by von gosling
parent 439796f7c4
commit ba91ec8a7e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/src/main/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommand.java
+15 -2
View File
@@ -142,7 +142,7 @@ public class ConsumeMessageCommand implements SubCommand {
if (commandLine.hasOption('c')) {
messageCount = Long.parseLong(commandLine.getOptionValue('c').trim());
if (messageCount <= 0) {
System.out.print("please input a positive messageNumber!");
System.out.print("Please input a positive messageNumber!");
return;
}
}
@@ -161,20 +161,33 @@ public class ConsumeMessageCommand implements SubCommand {
}
if (commandLine.hasOption('o')) {
if (consumeType != ConsumeType.BYQUEUE) {
System.out.print("please set queueId before offset!");
System.out.print("Please set queueId before offset!");
return;
}
offset = Long.parseLong(commandLine.getOptionValue('o').trim());
consumeType = ConsumeType.BYOFFSET;
}
long now = System.currentTimeMillis();
if (commandLine.hasOption('s')) {
String timestampStr = commandLine.getOptionValue('s').trim();
timeValueBegin = timestampFormat(timestampStr);
if (timeValueBegin > now) {
System.out.print("Please set the beginTimestamp before now!");
return;
}
}
if (commandLine.hasOption('e')) {
String timestampStr = commandLine.getOptionValue('e').trim();
timeValueEnd = timestampFormat(timestampStr);
if (timeValueEnd > now) {
System.out.print("Please set the endTimestamp before now!");
return;
}
if (timeValueBegin > timeValueEnd) {
System.out.print("Please make sure that the beginTimestamp is less than or equal to the endTimestamp");
return;
}
}
switch (consumeType) {