This is an automated email from the ASF dual-hosted git repository. yuanbo pushed a commit to branch TUBEMQ-421 in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
commit 40a34916c63be0a8b0fae3e0525d0671019f88d7 Author: gosonzhang <[email protected]> AuthorDate: Thu Dec 10 09:24:52 2020 +0800 [TUBEMQ-446]Small bugs fix that do not affect the main logics (#346) Co-authored-by: gosonzhang <[email protected]> --- .../src/main/java/org/apache/tubemq/corebase/utils/AddressUtils.java | 3 +++ .../main/java/org/apache/tubemq/example/MessageConsumerExample.java | 2 +- .../src/main/java/org/apache/tubemq/server/tools/cli/CliConsumer.java | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/AddressUtils.java b/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/AddressUtils.java index 2828bf7..206cb93 100644 --- a/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/AddressUtils.java +++ b/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/AddressUtils.java @@ -144,6 +144,9 @@ public class AddressUtils { } public static String getIPV4LocalAddress() { + if (localIPAddress != null) { + return localIPAddress; + } String tmpAdress = null; try { Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces(); diff --git a/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java b/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java index d9aeb8a..0252d16 100644 --- a/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java +++ b/tubemq-example/src/main/java/org/apache/tubemq/example/MessageConsumerExample.java @@ -96,7 +96,7 @@ public final class MessageConsumerExample { topicTidsMap.put(topicTidStr[0], tids); } final int startFetchCount = fetchCount; - final ExecutorService executorService = Executors.newFixedThreadPool(fetchCount); + final ExecutorService executorService = Executors.newCachedThreadPool(); for (int i = 0; i < consumerCount; i++) { executorService.submit(new Runnable() { @Override diff --git a/tubemq-server/src/main/java/org/apache/tubemq/server/tools/cli/CliConsumer.java b/tubemq-server/src/main/java/org/apache/tubemq/server/tools/cli/CliConsumer.java index 666e6f9..359ea44 100644 --- a/tubemq-server/src/main/java/org/apache/tubemq/server/tools/cli/CliConsumer.java +++ b/tubemq-server/src/main/java/org/apache/tubemq/server/tools/cli/CliConsumer.java @@ -103,7 +103,6 @@ public class CliConsumer extends CliAbstractBase { addCommandOption(CliArgDef.FETCHTHREADS); addCommandOption(CliArgDef.CLIENTCOUNT); addCommandOption(CliArgDef.OUTPUTINTERVAL); - addCommandOption(CliArgDef.WITHOUTDELAY); } public boolean parseParams(String[] args) throws Exception {
