@zintrust/queue-monitor 2.1.8 → 2.2.0

package/dist/driver.js

@@ -1,3 +1,4 @@
+import { Env } from '@zintrust/core/config';
 import { ErrorFactory } from '@zintrust/core/errors';
 import { Logger } from '@zintrust/core/logger';
 import { getBullMQSafeQueueName } from '@zintrust/core/redis';
@@ -46,12 +47,26 @@ async function discoverQueuesFromRedis(redis, inMemoryQueues) {
 // eslint-disable-next-line max-lines-per-function
 export const createBullMQDriver = (config) => {
     const queues = new Map();
-    const redis = createRedisConnection(config, 3, { subsystem: 'queue-monitor' });
+    const requireDirectForScripts = Env.getBool('REDIS_REQUIRE_DIRECT_FOR_SCRIPTS', true) && Env.getBool('USE_REDIS_PROXY', false);
+    let redis;
+    // TODO remove when proxy convert to rpc
+    if (requireDirectForScripts) {
+        redis = {
+            host: config.host,
+            port: config.port,
+            db: config.db,
+            password: config.password,
+        };
+    }
+    else {
+        redis = createRedisConnection(config, 3, {
+            subsystem: 'queue-monitor',
+        });
+    }
     const getQueue = (name) => {
         if (!queues.has(name)) {
             const prefix = getBullMQSafeQueueName();
-            const connection = createRedisConnection(config, 3, { subsystem: 'queue-monitor' });
-            const queue = new Queue(name, { prefix, connection: connection });
+            const queue = new Queue(name, { prefix, connection: redis });
             queues.set(name, queue);
         }
         const queue = queues.get(name);
@@ -82,30 +97,37 @@ export const createBullMQDriver = (config) => {
     };
     const getJobCountsMany = async (queueNames) => {
         const uniqueQueueNames = Array.from(new Set(queueNames.filter((queueName) => typeof queueName === 'string' && queueName.trim().length > 0)));
-        Logger.info('[queue-monitor] getJobCountsMany start', {
-            requestedCount: queueNames.length,
-            uniqueCount: uniqueQueueNames.length,
-        });
-        const startedAt = Date.now();
-        if (uniqueQueueNames.length === 0) {
-            Logger.info('[queue-monitor] getJobCountsMany complete', {
-                durationMs: Date.now() - startedAt,
+        const QUEUE_MONITOR_LOGGING_ENABLED = Env.getBool('QUEUE_MONITOR_LOGGING_ENABLED', false);
+        if (QUEUE_MONITOR_LOGGING_ENABLED) {
+            Logger.info('[queue-monitor] getJobCountsMany start', {
                 requestedCount: queueNames.length,
                 uniqueCount: uniqueQueueNames.length,
-                pipelineCount: 0,
             });
+        }
+        const startedAt = Date.now();
+        if (uniqueQueueNames.length === 0) {
+            if (QUEUE_MONITOR_LOGGING_ENABLED) {
+                Logger.info('[queue-monitor] getJobCountsMany complete', {
+                    durationMs: Date.now() - startedAt,
+                    requestedCount: queueNames.length,
+                    uniqueCount: uniqueQueueNames.length,
+                    pipelineCount: 0,
+                });
+            }
             return [];
         }
         const stats = await Promise.all(uniqueQueueNames.map(async (name) => {
             const counts = await getJobCounts(name);
             return { name, counts };
         }));
-        Logger.info('[queue-monitor] getJobCountsMany complete', {
-            durationMs: Date.now() - startedAt,
-            requestedCount: queueNames.length,
-            uniqueCount: uniqueQueueNames.length,
-            pipelineCount: uniqueQueueNames.length,
-        });
+        if (QUEUE_MONITOR_LOGGING_ENABLED) {
+            Logger.info('[queue-monitor] getJobCountsMany complete', {
+                durationMs: Date.now() - startedAt,
+                requestedCount: queueNames.length,
+                uniqueCount: uniqueQueueNames.length,
+                pipelineCount: uniqueQueueNames.length,
+            });
+        }
         return stats;
     };
     const requeueFromSnapshot = async (queue, snapshot) => {

package/dist/index.js

@@ -231,14 +231,17 @@ function createGetSnapshot(driver, startedAt, knownQueues) {
         const shouldDiscoverQueues = persistedQueues.length === 0;
         const discoveredQueues = shouldDiscoverQueues ? await driver.getQueues() : [];
         const queues = Array.from(new Set([...persistedQueues, ...discoveredQueues])).sort((left, right) => left.localeCompare(right));
-        Logger.info('[queue-monitor] snapshot queue list resolved', {
-            discoveredCount: discoveredQueues.length,
-            persistedCount: persistedQueues.length,
-            totalQueues: queues.length,
-            usedRedisDiscovery: shouldDiscoverQueues,
-            skippedRedisDiscovery: !shouldDiscoverQueues,
-            hasBatchCounts: typeof driver.getJobCountsMany === 'function',
-        });
+        const QUEUE_MONITOR_LOGGING_ENABLED = Env.getBool('QUEUE_MONITOR_LOGGING_ENABLED', false);
+        if (QUEUE_MONITOR_LOGGING_ENABLED) {
+            Logger.info('[queue-monitor] snapshot queue list resolved', {
+                discoveredCount: discoveredQueues.length,
+                persistedCount: persistedQueues.length,
+                totalQueues: queues.length,
+                usedRedisDiscovery: shouldDiscoverQueues,
+                skippedRedisDiscovery: !shouldDiscoverQueues,
+                hasBatchCounts: typeof driver.getJobCountsMany === 'function',
+            });
+        }
         const batchStartedAt = Date.now();
         const stats = typeof driver.getJobCountsMany === 'function'
             ? (await driver.getJobCountsMany(queues)).map((item) => ({
@@ -249,12 +252,14 @@ function createGetSnapshot(driver, startedAt, knownQueues) {
                 const counts = await driver.getJobCounts(name);
                 return { name, counts: counts };
             }));
-        Logger.info('[queue-monitor] snapshot queue counts resolved', {
-            durationMs: Date.now() - batchStartedAt,
-            totalQueues: queues.length,
-            returnedQueues: stats.length,
-            usedBatchCounts: typeof driver.getJobCountsMany === 'function',
-        });
+        if (QUEUE_MONITOR_LOGGING_ENABLED) {
+            Logger.info('[queue-monitor] snapshot queue counts resolved', {
+                durationMs: Date.now() - batchStartedAt,
+                totalQueues: queues.length,
+                returnedQueues: stats.length,
+                usedBatchCounts: typeof driver.getJobCountsMany === 'function',
+            });
+        }
         return {
             status: 'ok',
             startedAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/queue-monitor",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "Queue monitoring package for ZinTrust with BullMQ and Redis.",
   "private": false,
   "type": "module",