diff --git a/src/main/java/jasper/component/scheduler/Async.java b/src/main/java/jasper/component/scheduler/Async.java index d0ace4f1..9458fe8c 100644 --- a/src/main/java/jasper/component/scheduler/Async.java +++ b/src/main/java/jasper/component/scheduler/Async.java @@ -67,9 +67,9 @@ String trackingQuery() { } @Scheduled( - fixedRateString = "${jasper.async-interval-min}", - initialDelayString = "${jasper.async-delay-min}", - timeUnit = TimeUnit.MINUTES) + fixedRateString = "${jasper.async-interval-sec}", + initialDelayString = "${jasper.async-delay-sec}", + timeUnit = TimeUnit.SECONDS) public void drainAsyncTask() { if (tags.isEmpty() && responses.isEmpty()) return; for (var origin : props.getScrapeOrigins()) drain(origin); diff --git a/src/main/java/jasper/config/Props.java b/src/main/java/jasper/config/Props.java index b0d44399..9b6ffef0 100644 --- a/src/main/java/jasper/config/Props.java +++ b/src/main/java/jasper/config/Props.java @@ -33,8 +33,8 @@ public class Props { private int ingestMaxRetry = 5; private String[] modSeals; private String[] editorSeals; - private String asyncDelayMin = "2"; - private String asyncIntervalMin = "0.3"; + private String asyncDelaySec = "120"; + private String asyncIntervalSec = "40"; /** * Whitelist origins to run async tasks on. */ diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index fd4ad2ad..a032df06 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -75,6 +75,8 @@ server: jasper: replicate-delay-min: 0 replicate-interval-min: 1 + async-delay-sec: 0 + async-interval-sec: 6 scrape-delay-min: 5 scrape-interval-min: 5 # CORS is disabled by default on microservices, as you should access them through a gateway. diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 62862e33..6fc6e588 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -198,14 +198,14 @@ jasper: ingest-max-retry: 5 mod-seals: ['seal', '+seal', '_seal', '_moderated'] editor-seals: ['plugin/qc'] - replicate-delay-min: 0 + replicate-delay-min: 20 replicate-interval-min: 1 replicate-origins: [''] max-replicate-batch: 5000 - async-delay-min: 0 - async-interval-min: 1 + async-delay-sec: 120 + async-interval-sec: 60 async-origins: [''] - scrape-delay-min: 0 + scrape-delay-min: 20 scrape-interval-min: 1 scrape-origins: [''] local-origin: ''