- Increase the test-delays of the scheduled tasks.

- Update dependencies.
This commit is contained in:
Lampros Smyrnaios 2023-05-29 12:45:43 +03:00
parent f57314908a
commit 2b69733912
2 changed files with 4 additions and 4 deletions

View File

@ -25,7 +25,7 @@ dependencies {
implementation("org.springframework.security:spring-security-web")
implementation("org.springframework.security:spring-security-config")
implementation 'org.projectlombok:lombok:1.18.26'
implementation 'org.projectlombok:lombok:1.18.28'
//implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5' // Use this in case we use auth-tokens later on.
@ -39,7 +39,7 @@ dependencies {
exclude group: 'io.minio' // This is not used in the Worker, since it's the Controller which uploads the full-texts to S3. It also includes an older "commons-compress" version which causes problems.
}
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
implementation group: 'com.google.guava', name: 'guava', version: '32.0.0-jre'
// https://mvnrepository.com/artifact/com.google.code.gson/gson
implementation 'com.google.code.gson:gson:2.10.1'

View File

@ -66,7 +66,7 @@ public class ScheduledTasks {
@Scheduled(initialDelay = 900_000, fixedDelay = 1_800_000) // InitialDelay = 15 mins, FixedDelay = 30 mins.
//@Scheduled(initialDelay = 20_000, fixedDelay = 20_000) // Just for testing (every 20 secs).
//@Scheduled(initialDelay = 60_000, fixedDelay = 60_000) // Just for testing (every 60 secs).
public void checkIfShouldShutdown()
{
if ( !GeneralController.shouldShutdownWorker && !AssignmentsHandler.shouldNotRequestMore )
@ -102,7 +102,7 @@ public class ScheduledTasks {
private static final double hoursToWaitBeforeDeletion = 36.0;
@Scheduled(initialDelay = 21_600_000, fixedDelay = 21_600_000) // InitialDelay & FixedDelay = 36 hours.
//@Scheduled(initialDelay = 20_000, fixedDelay = 20_000) // Just for testing (every 20 secs).
//@Scheduled(initialDelay = 120_000, fixedDelay = 120_000) // Just for testing (every 2 mins).
public void checkAndDeleteOldFiles() {
// For any reason the Worker-report connection with the Controller may fail, but the Controller will continue requesting the full-text batches.