@zintrust/queue-monitor 2.1.7 → 2.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/driver.js +18 -3
- package/dist/index.d.ts +3 -2
- package/dist/index.js +4 -3
- package/package.json +1 -1
package/dist/driver.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Env } from '@zintrust/core/config';
|
|
1
2
|
import { ErrorFactory } from '@zintrust/core/errors';
|
|
2
3
|
import { Logger } from '@zintrust/core/logger';
|
|
3
4
|
import { getBullMQSafeQueueName } from '@zintrust/core/redis';
|
|
@@ -46,12 +47,26 @@ async function discoverQueuesFromRedis(redis, inMemoryQueues) {
|
|
|
46
47
|
// eslint-disable-next-line max-lines-per-function
|
|
47
48
|
export const createBullMQDriver = (config) => {
|
|
48
49
|
const queues = new Map();
|
|
49
|
-
const
|
|
50
|
+
const requireDirectForScripts = Env.getBool('REDIS_REQUIRE_DIRECT_FOR_SCRIPTS', true) && Env.getBool('USE_REDIS_PROXY', false);
|
|
51
|
+
let redis;
|
|
52
|
+
// TODO remove when proxy convert to rpc
|
|
53
|
+
if (requireDirectForScripts) {
|
|
54
|
+
redis = {
|
|
55
|
+
host: config.host,
|
|
56
|
+
port: config.port,
|
|
57
|
+
db: config.db,
|
|
58
|
+
password: config.password,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
redis = createRedisConnection(config, 3, {
|
|
63
|
+
subsystem: 'queue-monitor',
|
|
64
|
+
});
|
|
65
|
+
}
|
|
50
66
|
const getQueue = (name) => {
|
|
51
67
|
if (!queues.has(name)) {
|
|
52
68
|
const prefix = getBullMQSafeQueueName();
|
|
53
|
-
const
|
|
54
|
-
const queue = new Queue(name, { prefix, connection: connection });
|
|
69
|
+
const queue = new Queue(name, { prefix, connection: redis });
|
|
55
70
|
queues.set(name, queue);
|
|
56
71
|
}
|
|
57
72
|
const queue = queues.get(name);
|
package/dist/index.d.ts
CHANGED
|
@@ -2,7 +2,9 @@ import { type IRouter } from '@zintrust/core/http';
|
|
|
2
2
|
import { type RedisConfig } from './connection.js';
|
|
3
3
|
import { type QueueDriver } from './driver.js';
|
|
4
4
|
import { type Metrics } from './metrics.js';
|
|
5
|
-
export
|
|
5
|
+
export { getRecentJobsForQueue, getRecentJobsForSelection, QueueMonitoringService, QueueMonitoringStream, } from './QueueMonitoringService.js';
|
|
6
|
+
export { createBullMQDriver } from './driver.js';
|
|
7
|
+
export type { JobPayload, QueueDriver } from './driver.js';
|
|
6
8
|
export { createMetrics, type JobStatus, type JobSummary, type Metrics } from './metrics.js';
|
|
7
9
|
export { createWorker as createQueueWorker, type QueueWorker } from './worker.js';
|
|
8
10
|
export type QueueMonitorConfig = {
|
|
@@ -63,7 +65,6 @@ export declare const QueueMonitor: Readonly<{
|
|
|
63
65
|
create(config: QueueMonitorConfig): QueueMonitorApi;
|
|
64
66
|
}>;
|
|
65
67
|
export default QueueMonitor;
|
|
66
|
-
export { createBullMQDriver } from './driver.js';
|
|
67
68
|
/**
|
|
68
69
|
* Package version and build metadata
|
|
69
70
|
* Available at runtime for debugging and health checks
|
package/dist/index.js
CHANGED
|
@@ -6,9 +6,11 @@ import { isNonEmptyString } from '@zintrust/core/utils';
|
|
|
6
6
|
import { ShutdownTrace } from '@zintrust/core/workers';
|
|
7
7
|
import { createRedisConnection } from './connection.js';
|
|
8
8
|
import { getDashboardHtml } from './dashboard-ui.js';
|
|
9
|
-
import { createBullMQDriver } from './driver.js';
|
|
9
|
+
import { createBullMQDriver as createQueueDriver, } from './driver.js';
|
|
10
10
|
import { createMetrics } from './metrics.js';
|
|
11
11
|
import { getRecentJobsForSelection, QueueMonitoringStream } from './QueueMonitoringService.js';
|
|
12
|
+
export { getRecentJobsForQueue, getRecentJobsForSelection, QueueMonitoringService, QueueMonitoringStream, } from './QueueMonitoringService.js';
|
|
13
|
+
export { createBullMQDriver } from './driver.js';
|
|
12
14
|
export { createMetrics } from './metrics.js';
|
|
13
15
|
export { createWorker as createQueueWorker } from './worker.js';
|
|
14
16
|
const DEFAULTS = {
|
|
@@ -337,7 +339,7 @@ export const QueueMonitor = Object.freeze({
|
|
|
337
339
|
db: queueConfig.drivers.redis.database,
|
|
338
340
|
};
|
|
339
341
|
}
|
|
340
|
-
const driver =
|
|
342
|
+
const driver = createQueueDriver(redisConfig);
|
|
341
343
|
const metrics = createMetrics(redisConfig);
|
|
342
344
|
const startedAt = new Date().toISOString();
|
|
343
345
|
ShutdownTrace.logHandles('queue-monitor.create', {
|
|
@@ -368,7 +370,6 @@ export const QueueMonitor = Object.freeze({
|
|
|
368
370
|
},
|
|
369
371
|
});
|
|
370
372
|
export default QueueMonitor;
|
|
371
|
-
export { createBullMQDriver } from './driver.js';
|
|
372
373
|
/**
|
|
373
374
|
* Package version and build metadata
|
|
374
375
|
* Available at runtime for debugging and health checks
|