feat(backend): address comments2

loculus-project · Feb 8, 2024 · 79d1bbf · 79d1bbf
1 parent d8e0e1e
commit 79d1bbf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/.idea/runConfigurations/BackendApplicationKt.run.xml b/.idea/runConfigurations/BackendApplicationKt.run.xml
diff --git a/backend/src/main/kotlin/org/loculus/backend/config/BackendSpringConfig.kt b/backend/src/main/kotlin/org/loculus/backend/config/BackendSpringConfig.kt
@@ -20,8 +20,7 @@ import javax.sql.DataSource
 
 object BackendSpringProperty {
     const val BACKEND_CONFIG_PATH = "loculus.config.path"
-    const val ENABLE_CLEAN_UP_TASK = "loculus.cleanup.task.enabled"
-    const val STALE_AFTER_SECONDS = "loculus.cleanup.task.reset-stale-in-processing-every-seconds"
+    const val STALE_AFTER_SECONDS = "loculus.cleanup.task.reset-stale-in-processing-after-seconds"
     const val CLEAN_UP_RUN_EVERY_SECONDS = "loculus.cleanup.task.run-every-seconds"
 }
 

diff --git a/...in/kotlin/org/loculus/backend/service/submission/CleanUpStaleSequencesInProcessingTask.kt b/...in/kotlin/org/loculus/backend/service/submission/CleanUpStaleSequencesInProcessingTask.kt
@@ -2,18 +2,12 @@ package org.loculus.backend.service.submission
 
 import org.loculus.backend.config.BackendSpringProperty
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 
 private val log = mu.KotlinLogging.logger {}
 
 @Component
-@ConditionalOnProperty(
-    name = ["\${${BackendSpringProperty.ENABLE_CLEAN_UP_TASK}}"],
-    havingValue = "true",
-    matchIfMissing = true,
-)
 class CleanUpStaleSequencesInProcessingTask(
     private val submissionDatabaseService: SubmissionDatabaseService,
     @Value("\${${BackendSpringProperty.STALE_AFTER_SECONDS}}") private val timeToStaleInSeconds: Long,

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -18,6 +18,6 @@ management.endpoints.web.exposure.include=health
 management.health.livenessState.enabled=true
 management.health.readinessState.enabled=true
 
-loculus.cleanup.task.reset-stale-in-processing-every-seconds=60
+loculus.cleanup.task.reset-stale-in-processing-after-seconds=60
 loculus.cleanup.task.run-every-seconds=60
-loculus.cleanup.task.enabled=true
+