Skip to content
Snippets Groups Projects
Unverified Commit dfd09f45 authored by Matthias Urhahn's avatar Matthias Urhahn Committed by GitHub
Browse files

The timeout checker doesn't need to force an app-config refresh, it's fine...

The timeout checker doesn't need to force an app-config refresh, it's fine working with the latest available one. (#1573)

Co-authored-by: default avatarRalf Gehrer <ralfgehrer@users.noreply.github.com>
parent 0753c49c
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ import de.rki.coronawarnapp.util.mutate ...@@ -10,6 +10,7 @@ import de.rki.coronawarnapp.util.mutate
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
...@@ -48,7 +49,7 @@ class DefaultExposureDetectionTracker @Inject constructor( ...@@ -48,7 +49,7 @@ class DefaultExposureDetectionTracker @Inject constructor(
hd.updateSafely { hd.updateSafely {
val timeNow = timeStamper.nowUTC val timeNow = timeStamper.nowUTC
Timber.v("Running timeout check (now=%s): %s", timeNow, values) Timber.v("Running timeout check (now=%s): %s", timeNow, values)
val timeoutLimit = appConfigProvider.getAppConfig().overallDetectionTimeout val timeoutLimit = appConfigProvider.currentConfig.first().overallDetectionTimeout
mutate { mutate {
values.filter { it.isCalculating }.toList().forEach { values.filter { it.isCalculating }.toList().forEach {
if (timeNow.isAfter(it.startedAt.plus(timeoutLimit))) { if (timeNow.isAfter(it.startedAt.plus(timeoutLimit))) {
......
...@@ -18,6 +18,7 @@ import io.mockk.just ...@@ -18,6 +18,7 @@ import io.mockk.just
import io.mockk.verify import io.mockk.verify
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runBlockingTest import kotlinx.coroutines.test.runBlockingTest
import org.joda.time.Duration import org.joda.time.Duration
import org.joda.time.Instant import org.joda.time.Instant
...@@ -44,7 +45,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() { ...@@ -44,7 +45,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() {
coEvery { storage.load() } returns emptyMap() coEvery { storage.load() } returns emptyMap()
coEvery { storage.save(any()) } just Runs coEvery { storage.save(any()) } just Runs
coEvery { configProvider.getAppConfig() } returns appConfigData coEvery { configProvider.currentConfig } returns flowOf(appConfigData)
every { appConfigData.overallDetectionTimeout } returns Duration.standardMinutes(15) every { appConfigData.overallDetectionTimeout } returns Duration.standardMinutes(15)
} }
...@@ -107,7 +108,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() { ...@@ -107,7 +108,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() {
advanceUntilIdle() advanceUntilIdle()
} }
coVerify { configProvider.getAppConfig() } coVerify { configProvider.currentConfig }
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment