Verify the config RedisquesConfiguration if the parameter getDequeueS…

…tatisticReportIntervalSec is active to process attachDequeueStats.
swisspost · Sep 9, 2024 · c5a4c19 · c5a4c19
1 parent 70dc264
commit c5a4c19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/org/swisspush/redisques/QueueStatsService.java b/src/main/java/org/swisspush/redisques/QueueStatsService.java
@@ -9,6 +9,7 @@
 import org.swisspush.redisques.util.DequeueStatistic;
 import org.swisspush.redisques.util.DequeueStatisticCollector;
 import org.swisspush.redisques.util.QueueStatisticsCollector;
+import org.swisspush.redisques.util.RedisquesConfiguration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,15 +51,17 @@ public class QueueStatsService {
     private final DequeueStatisticCollector dequeueStatisticCollector;
     private final RedisQuesExceptionFactory exceptionFactory;
     private final Semaphore incomingRequestQuota;
+    private final RedisquesConfiguration modConfig;
 
     public QueueStatsService(
-        Vertx vertx,
-        EventBus eventBus,
-        String redisquesAddress,
-        QueueStatisticsCollector queueStatisticsCollector,
-        DequeueStatisticCollector dequeueStatisticCollector,
-        RedisQuesExceptionFactory exceptionFactory,
-        Semaphore incomingRequestQuota
+            Vertx vertx,
+            EventBus eventBus,
+            String redisquesAddress,
+            QueueStatisticsCollector queueStatisticsCollector,
+            DequeueStatisticCollector dequeueStatisticCollector,
+            RedisQuesExceptionFactory exceptionFactory,
+            Semaphore incomingRequestQuota,
+            RedisquesConfiguration modConfig
     ) {
         this.vertx = vertx;
         this.eventBus = eventBus;
@@ -67,6 +70,7 @@ public QueueStatsService(
         this.dequeueStatisticCollector = dequeueStatisticCollector;
         this.exceptionFactory = exceptionFactory;
         this.incomingRequestQuota = incomingRequestQuota;
+        this.modConfig = modConfig;
     }
 
     public <CTX> void getQueueStats(CTX mCtx, GetQueueStatsMentor<CTX> mentor) {
@@ -97,10 +101,12 @@ public <CTX> void getQueueStats(CTX mCtx, GetQueueStatsMentor<CTX> mentor) {
                 for (Queue q : req1.queues) req1.queueNames.add(q.name);
                 fetchRetryDetails(req1, (ex2, req2) -> {
                     if (ex2 != null) { onDone.accept(ex2, null); return; }
-                    attachDequeueStats(req2, (ex3, req3) -> {
-                        if (ex3 != null) { onDone.accept(ex3, null); return; }
-                        onDone.accept(null, req3.queues);
-                    });
+                    if (modConfig.getDequeueStatisticReportIntervalSec() > 0){
+                        attachDequeueStats(req2, (ex3, req3) -> {
+                            if (ex3 != null) { onDone.accept(ex3, null); return; }
+                            onDone.accept(null, req3.queues);
+                        });
+                    }
                 });
             });
         } catch (Exception ex) {

diff --git a/src/main/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandler.java b/src/main/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandler.java
@@ -138,7 +138,7 @@ private RedisquesHttpRequestHandler(
         this.exceptionFactory = exceptionFactory;
         this.queueStatsService = new QueueStatsService(
                 vertx, eventBus, redisquesAddress, queueStatisticsCollector, dequeueStatisticCollector,
-                exceptionFactory, queueStatsRequestQuota);
+                exceptionFactory, queueStatsRequestQuota,modConfig);
 
         final String prefix = modConfig.getHttpRequestHandlerPrefix();