From e87969e7e5c26d133c8043aea2c3f848580f33f3 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Fri, 25 Jun 2021 17:08:41 +0200 Subject: [PATCH] Reduced HTTP connections timeouts Signed-off-by: Alexander Borsuk --- android/src/com/mapswithme/maps/downloader/ChunkTask.java | 2 +- android/src/com/mapswithme/util/Constants.java | 2 +- platform/background_downloader_ios.mm | 6 +++++- platform/http_thread_apple.mm | 4 ++-- storage/pinger.cpp | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/android/src/com/mapswithme/maps/downloader/ChunkTask.java b/android/src/com/mapswithme/maps/downloader/ChunkTask.java index ca1ae2c316..27b307dba4 100644 --- a/android/src/com/mapswithme/maps/downloader/ChunkTask.java +++ b/android/src/com/mapswithme/maps/downloader/ChunkTask.java @@ -27,7 +27,7 @@ class ChunkTask extends AsyncTask private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.DOWNLOADER); private static final String TAG = "ChunkTask"; - private static final int TIMEOUT_IN_SECONDS = 60; + private static final int TIMEOUT_IN_SECONDS = 10; private final long mHttpCallbackID; private final String mUrl; diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java index d335c49f1f..7aa0f276dd 100644 --- a/android/src/com/mapswithme/util/Constants.java +++ b/android/src/com/mapswithme/util/Constants.java @@ -9,7 +9,7 @@ public final class Constants public static final int GB = 1024 * 1024 * 1024; static final int CONNECTION_TIMEOUT_MS = 5000; - static final int READ_TIMEOUT_MS = 30000; + static final int READ_TIMEOUT_MS = 10000; public static class Url { diff --git a/platform/background_downloader_ios.mm b/platform/background_downloader_ios.mm index 0cf3aee0bc..43135043da 100644 --- a/platform/background_downloader_ios.mm +++ b/platform/background_downloader_ios.mm @@ -2,6 +2,9 @@ #include "platform/downloader_utils.hpp" +// How many seconds to wait before the request fails. +static const NSTimeInterval kTimeoutIntervalInSeconds = 10; + @interface TaskInfo : NSObject @property(nonatomic, strong) NSURLSessionTask *task; @@ -74,7 +77,8 @@ if (self) { NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:name]; - [configuration setSessionSendsLaunchEvents:YES]; + configuration.sessionSendsLaunchEvents = YES; + configuration.timeoutIntervalForRequest = kTimeoutIntervalInSeconds; _session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil]; _tasks = [NSMutableDictionary dictionary]; _saveStrategy = saveStrategy; diff --git a/platform/http_thread_apple.mm b/platform/http_thread_apple.mm index e805532a0c..3c8a436064 100644 --- a/platform/http_thread_apple.mm +++ b/platform/http_thread_apple.mm @@ -8,7 +8,7 @@ #include "base/logging.hpp" #include "base/macros.hpp" -#define TIMEOUT_IN_SECONDS 60.0 +static const NSTimeInterval kTimeoutInterval = 10.0; @interface HttpThreadImpl () { @@ -68,7 +68,7 @@ static id downloadIndicator = nil; NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@(url.c_str())] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData - timeoutInterval:TIMEOUT_IN_SECONDS]; + timeoutInterval:kTimeoutInterval]; // use Range header only if we don't download whole file from start if (!(beg == 0 && end < 0)) diff --git a/storage/pinger.cpp b/storage/pinger.cpp index c483330092..1f2eb74c8d 100644 --- a/storage/pinger.cpp +++ b/storage/pinger.cpp @@ -17,7 +17,7 @@ using namespace std::chrono; namespace { -auto constexpr kTimeoutInSeconds = 5.0; +auto constexpr kTimeoutInSeconds = 4.0; int32_t DoPing(string const & url) {