From ba52c1516bf4496bf7c990d0f2686cadbc517573 Mon Sep 17 00:00:00 2001 From: litoral05 Date: Mon, 1 Jun 2026 12:08:28 +0100 Subject: [PATCH] Changes delay betweeen scheduler to fixed 3s --- .../scheduler/AcquisitionSchedulerService.java | 15 ++++++++++++++- .../backend/historian/HistorianService.java | 1 - src/main/resources/application.yaml | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/litoralregas/backend/acquisition/scheduler/AcquisitionSchedulerService.java b/src/main/java/com/litoralregas/backend/acquisition/scheduler/AcquisitionSchedulerService.java index d1e256f..55fda35 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/scheduler/AcquisitionSchedulerService.java +++ b/src/main/java/com/litoralregas/backend/acquisition/scheduler/AcquisitionSchedulerService.java @@ -76,7 +76,7 @@ public class AcquisitionSchedulerService { System.out.println("Starting acquisition scheduler."); - taskScheduler.scheduleWithFixedDelay( + taskScheduler.scheduleAtFixedRate( this::safePoll, properties.getFixedDelayMillis() ); @@ -96,13 +96,26 @@ public class AcquisitionSchedulerService { runtimeStatus.setLastStartedAt(Instant.now()); runtimeStatus.setLastError(null); + long started = System.currentTimeMillis(); + try { AcquisitionPollResult result = blockPollingService.pollOnceByBlocks(); + System.out.println( + "pollOnceByBlocks took " + + (System.currentTimeMillis() - started) + + " ms" + ); + long wsStart = System.currentTimeMillis(); runtimeStatus.setLastSuccessfulReads(result.successfulReads()); runtimeStatus.setLastFailedReads(result.failedReads()); telemetryWebSocketPublisher.publishLatestTelemetry(); + System.out.println( + "publishLatestTelemetry took " + + (System.currentTimeMillis() - wsStart) + + " ms" + ); DashboardOverviewResponse overview = dashboardOverviewService.getOverview(); diff --git a/src/main/java/com/litoralregas/backend/historian/HistorianService.java b/src/main/java/com/litoralregas/backend/historian/HistorianService.java index 2c13d59..a7d9165 100644 --- a/src/main/java/com/litoralregas/backend/historian/HistorianService.java +++ b/src/main/java/com/litoralregas/backend/historian/HistorianService.java @@ -60,7 +60,6 @@ public class HistorianService { sample.setNumericValue(value.doubleValue()); sample.setUnit(unit); sample.setSource(SOURCE_MODULE); - System.out.println("Saving historian sample: " + keyName + " = " + value); historianSampleRepository.save(sample); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 13e43a2..ad2425e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -33,7 +33,7 @@ litoralregas: acquisition: scheduler: enabled: true - fixed-delay-millis: 10000 # change here for longer wait between cycles + fixed-delay-millis: 3000 # change here for longer wait between cycles weather: enabled: true