diff --git a/components/pruner/src/main/kotlin/vdi/component/pruner/PrunerConfig.kt b/components/pruner/src/main/kotlin/vdi/component/pruner/PrunerConfig.kt index fb907721..62768ff3 100644 --- a/components/pruner/src/main/kotlin/vdi/component/pruner/PrunerConfig.kt +++ b/components/pruner/src/main/kotlin/vdi/component/pruner/PrunerConfig.kt @@ -8,6 +8,7 @@ import org.veupathdb.vdi.lib.common.env.optDuration import org.veupathdb.vdi.lib.common.env.require import org.veupathdb.vdi.lib.s3.datasets.util.S3Config import kotlin.time.Duration +import kotlin.time.Duration.Companion.minutes data class PrunerConfig( val s3Config: S3Config, @@ -19,7 +20,9 @@ data class PrunerConfig( constructor(env: Environment) : this ( s3Config = S3Config(env), bucketName = BucketName(env.require(EnvKey.S3.BucketName)), - pruneAge = env.optDuration(EnvKey.Pruner.DeletionThreshold) - ?: PrunerConfigDefaults.DeletionThreshold +// pruneAge = env.optDuration(EnvKey.Pruner.DeletionThreshold) +// ?: PrunerConfigDefaults.DeletionThreshold + // FIXME: REMOVE THIS AFTER MINIO WIPE + pruneAge = 5.minutes ) } diff --git a/modules/pruner/src/main/kotlin/vdi/module/pruner/PrunerModuleConfig.kt b/modules/pruner/src/main/kotlin/vdi/module/pruner/PrunerModuleConfig.kt index 0863d63d..c073e78d 100644 --- a/modules/pruner/src/main/kotlin/vdi/module/pruner/PrunerModuleConfig.kt +++ b/modules/pruner/src/main/kotlin/vdi/module/pruner/PrunerModuleConfig.kt @@ -14,8 +14,10 @@ data class PrunerModuleConfig( constructor() : this(System.getenv()) constructor(env: Environment) : this( - pruningInterval = env.optDuration(EnvKey.Pruner.PruningInterval) - ?: Defaults.PruningInterval, + // FIXME: Remove this after MinIO wipe! + pruningInterval = 1.hours, +// pruningInterval = env.optDuration(EnvKey.Pruner.PruningInterval) +// ?: Defaults.PruningInterval, wakeupInterval = env.optDuration(EnvKey.Pruner.PruningWakeupInterval) ?: Defaults.WakeupInterval )