From d009c9b2edf34e0147b405dcd2b8d5e3d10a9ca9 Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Thu, 30 Jul 2020 19:14:39 +0800 Subject: [PATCH] --- src/org/redkale/mq/HttpMessageClusterClient.java | 4 ++-- src/org/redkale/mq/MessageClient.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/redkale/mq/HttpMessageClusterClient.java b/src/org/redkale/mq/HttpMessageClusterClient.java index 38d41fa01..554b38495 100644 --- a/src/org/redkale/mq/HttpMessageClusterClient.java +++ b/src/org/redkale/mq/HttpMessageClusterClient.java @@ -68,7 +68,7 @@ public class HttpMessageClusterClient extends HttpMessageClient { String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESOURCE_NAME, ""); return clusterAgent.queryMqtpAddress("mqtp", module, resname).thenCompose(addrmap -> { if (addrmap == null || addrmap.isEmpty()) return new HttpResult().status(404).toAnyFuture(); - java.net.http.HttpRequest.Builder builder = java.net.http.HttpRequest.newBuilder().timeout(Duration.ofMillis(6000)); + java.net.http.HttpRequest.Builder builder = java.net.http.HttpRequest.newBuilder().timeout(Duration.ofMillis(30000)); if (req.isRpc()) builder.header(Rest.REST_HEADER_RPC_NAME, "true"); if (userid != 0) builder.header(Rest.REST_HEADER_CURRUSERID_NAME, "" + userid); if (headers != null) headers.forEach((n, v) -> { @@ -101,7 +101,7 @@ public class HttpMessageClusterClient extends HttpMessageClient { String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESOURCE_NAME, ""); return clusterAgent.queryHttpAddress("http", module, resname).thenCompose(addrs -> { if (addrs == null || addrs.isEmpty()) return new HttpResult().status(404).toAnyFuture(); - java.net.http.HttpRequest.Builder builder = java.net.http.HttpRequest.newBuilder().timeout(Duration.ofMillis(6000)); + java.net.http.HttpRequest.Builder builder = java.net.http.HttpRequest.newBuilder().timeout(Duration.ofMillis(30000)); if (req.isRpc()) builder.header(Rest.REST_HEADER_RPC_NAME, "true"); if (userid != 0) builder.header(Rest.REST_HEADER_CURRUSERID_NAME, "" + userid); if (headers != null) headers.forEach((n, v) -> { diff --git a/src/org/redkale/mq/MessageClient.java b/src/org/redkale/mq/MessageClient.java index ef9964948..c4bd7c427 100644 --- a/src/org/redkale/mq/MessageClient.java +++ b/src/org/redkale/mq/MessageClient.java @@ -74,7 +74,7 @@ public abstract class MessageClient { MessageRespFutureNode node = new MessageRespFutureNode(message, respNodes, counter, future); respNodes.put(message.getSeqid(), node); ScheduledThreadPoolExecutor executor = messageAgent.timeoutExecutor; - if (executor != null) executor.schedule(node, 6, TimeUnit.SECONDS); + if (executor != null) executor.schedule(node, 30, TimeUnit.SECONDS); } else { future.complete(null); }