init redis lazy

This commit is contained in:
Carl-Gerhard Lindesvärd
2024-07-20 20:17:32 +02:00
parent 492141547d
commit f2298a1b05
19 changed files with 134 additions and 86 deletions

View File

@@ -5,12 +5,8 @@ import type { WorkerOptions } from 'bullmq';
import { Worker } from 'bullmq';
import express from 'express';
import {
connection,
cronQueue,
eventsQueue,
sessionsQueue,
} from '@openpanel/queue';
import { cronQueue, eventsQueue, sessionsQueue } from '@openpanel/queue';
import { getRedisQueue } from '@openpanel/redis';
import { cronJob } from './jobs/cron';
import { eventsJob } from './jobs/events';
@@ -23,12 +19,7 @@ serverAdapter.setBasePath(process.env.SELF_HOSTED ? '/worker' : '/');
const app = express();
const workerOptions: WorkerOptions = {
connection: {
...connection,
enableReadyCheck: false,
maxRetriesPerRequest: null,
enableOfflineQueue: true,
},
connection: getRedisQueue(),
concurrency: parseInt(process.env.CONCURRENCY || '1', 10),
};

View File

@@ -14,7 +14,7 @@ import type {
EventsQueuePayloadCreateSessionEnd,
EventsQueuePayloadIncomingEvent,
} from '@openpanel/queue';
import { redis } from '@openpanel/redis';
import { getRedisQueue } from '@openpanel/redis';
function noDateInFuture(eventDate: Date): Date {
if (eventDate > new Date()) {
@@ -217,7 +217,9 @@ async function getSessionEnd({
currentDeviceId: string;
previousDeviceId: string;
}) {
const sessionEndKeys = await redis.keys(`*:sessionEnd:${projectId}:*`);
const sessionEndKeys = await getRedisQueue().keys(
`*:sessionEnd:${projectId}:*`
);
const sessionEndJobCurrentDeviceId = await findJobByPrefix(
sessionsQueue,

View File

@@ -7,7 +7,6 @@ import type {
EventsQueuePayloadCreateSessionEnd,
EventsQueuePayloadIncomingEvent,
} from '@openpanel/queue';
import { redis } from '@openpanel/redis';
import { createSessionEnd } from './events.create-session-end';
import { incomingEvent } from './events.incoming-event';

View File

@@ -1,7 +1,7 @@
import client from 'prom-client';
import { cronQueue, eventsQueue, sessionsQueue } from '@openpanel/queue';
import { redis } from '@openpanel/redis';
import { getRedisCache } from '@openpanel/redis';
const Registry = client.Registry;
@@ -75,7 +75,7 @@ buffers.forEach((buffer) => {
name: `buffer_${buffer}_count`,
help: 'Number of users in the users array',
async collect() {
const metric = await redis.llen(`op:buffer:${buffer}`);
const metric = await getRedisCache().llen(`op:buffer:${buffer}`);
this.set(metric);
},
})
@@ -86,7 +86,9 @@ buffers.forEach((buffer) => {
name: `buffer_${buffer}_stalled_count`,
help: 'Number of users in the users array',
async collect() {
const metric = await redis.llen(`op:buffer:${buffer}:stalled`);
const metric = await getRedisCache().llen(
`op:buffer:${buffer}:stalled`
);
this.set(metric);
},
})