From 0c9f0b61db3f73dc7755514ea8772a1202f8cb86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com> Date: Thu, 10 Sep 2020 11:31:07 +0200 Subject: [PATCH] Double Timeout Variables for HTTP Requests and Triple the Timeout for the Transaction to ensure less timeouts are received with bad networking. (EXPOSUREAPP-2190) (#1138) Signed-off-by: d067928 <jakob.moeller@sap.com> --- .../java/de/rki/coronawarnapp/http/config/HTTPVariables.kt | 6 +++--- .../main/java/de/rki/coronawarnapp/risk/TimeVariables.kt | 2 +- .../de/rki/coronawarnapp/http/config/HTTPVariablesTest.kt | 6 +++--- .../java/de/rki/coronawarnapp/risk/TimeVariablesTest.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt index 4939bf675..72a3dad13 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/config/HTTPVariables.kt @@ -5,7 +5,7 @@ object HTTPVariables { * The maximal runtime of a transaction * In milliseconds */ - private const val HTTP_CONNECTION_TIMEOUT = 10000L + private const val HTTP_CONNECTION_TIMEOUT = 20000L /** * Getter function for [HTTP_CONNECTION_TIMEOUT] @@ -19,7 +19,7 @@ object HTTPVariables { * The maximal runtime of a transaction * In milliseconds */ - private const val HTTP_READ_TIMEOUT = 10000L + private const val HTTP_READ_TIMEOUT = 20000L /** * Getter function for [HTTP_READ_TIMEOUT] @@ -33,7 +33,7 @@ object HTTPVariables { * The maximal runtime of a transaction * In milliseconds */ - private const val HTTP_WRITE_TIMEOUT = 10000L + private const val HTTP_WRITE_TIMEOUT = 20000L /** * Getter function for [HTTP_WRITE_TIMEOUT] diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt index 1857d1273..a12d781a1 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TimeVariables.kt @@ -34,7 +34,7 @@ object TimeVariables { * The maximal runtime of a transaction * In milliseconds */ - private const val TRANSACTION_TIMEOUT = 60000L + private const val TRANSACTION_TIMEOUT = 180000L /** * Getter function for [TRANSACTION_TIMEOUT] diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/config/HTTPVariablesTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/config/HTTPVariablesTest.kt index f0f051a51..c3ce75478 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/config/HTTPVariablesTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/config/HTTPVariablesTest.kt @@ -7,16 +7,16 @@ class HTTPVariablesTest { @Test fun getHTTPConnectionTimeout() { - Assert.assertEquals(HTTPVariables.getHTTPConnectionTimeout(), 10000L) + Assert.assertEquals(HTTPVariables.getHTTPConnectionTimeout(), 20000L) } @Test fun getHTTPReadTimeout() { - Assert.assertEquals(HTTPVariables.getHTTPReadTimeout(), 10000L) + Assert.assertEquals(HTTPVariables.getHTTPReadTimeout(), 20000L) } @Test fun getHTTPWriteTimeout() { - Assert.assertEquals(HTTPVariables.getHTTPWriteTimeout(), 10000L) + Assert.assertEquals(HTTPVariables.getHTTPWriteTimeout(), 20000L) } } diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/TimeVariablesTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/TimeVariablesTest.kt index 0f769204d..457522af9 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/TimeVariablesTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/TimeVariablesTest.kt @@ -14,7 +14,7 @@ class TimeVariablesTest { @Test fun getTransactionTimeout() { - Assert.assertEquals(TimeVariables.getTransactionTimeout(), 60000L) + Assert.assertEquals(TimeVariables.getTransactionTimeout(), 180000L) } @Test -- GitLab