From fe3782b5f9989a157278638b26dd14519b3da0b2 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 31 May 2016 13:25:37 +0800 Subject: [PATCH] shorten long polling timeout --- .../framework/apollo/internals/RemoteConfigRepository.java | 4 ++-- .../configservice/controller/NotificationController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java index 7f3c2035e..8408c0445 100644 --- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java +++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java @@ -274,8 +274,8 @@ public class RemoteConfigRepository extends AbstractConfigRepository { logger.debug("Long polling from {}", url); HttpRequest request = new HttpRequest(url); - //no timeout for read - request.setReadTimeout(0); + //longer timeout for read - 1 minute + request.setReadTimeout(60000); transaction = Cat.newTransaction("Apollo.ConfigService", "pollNotification"); transaction.addData("Url", url); diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java index 2b7341960..f2f63e7d5 100644 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java @@ -40,7 +40,7 @@ import java.util.Set; @RequestMapping("/notifications") public class NotificationController implements MessageListener { private static final Logger logger = LoggerFactory.getLogger(NotificationController.class); - private static final long TIMEOUT = 360 * 60 * 1000;//6 hours + private static final long TIMEOUT = 30 * 1000;//30 seconds private final Multimap>> deferredResults = Multimaps.synchronizedSetMultimap(HashMultimap.create()); private static final ResponseEntity -- GitLab