Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix api delayed jobs

Carl-Gerhard Lindesvärd8f03520645df
diff --git a/apps/sdk-api/src/controllers/event.controller.ts b/apps/sdk-api/src/controllers/event.controller.ts
index 111565c6a..a1aa9c189 100644
--- a/apps/sdk-api/src/controllers/event.controller.ts
+++ b/apps/sdk-api/src/controllers/event.controller.ts
@@ -267,6 +267,10 @@ export async function postEvent(
await withTiming('Promote previous job', prevEventJob.promote());
}
+ } else if (payload.name !== 'screen_view') {
+ contextLogger.send('no previous job', {
+ prevEventJob,
+ });
}
if (createSessionStart) {
diff --git a/apps/sdk-api/src/utils/logger.ts b/apps/sdk-api/src/utils/logger.ts
index 1f03d4b2f..eb3bf857b 100644
--- a/apps/sdk-api/src/utils/logger.ts
+++ b/apps/sdk-api/src/utils/logger.ts
@@ -1,19 +1,22 @@
+import type { TransportTargetOptions } from 'pino';
import pino from 'pino';
-const ENABLED = process.env.NODE_ENV === 'production';
-
-const transport = pino.transport({
- targets: ENABLED
+const targets: TransportTargetOptions[] =
+ process.env.NODE_ENV === 'production'
? [
{
target: '@logtail/pino',
options: { sourceToken: process.env.BETTERSTACK_TOKEN },
},
+ ]
+ : [
{
target: 'pino-pretty',
},
- ]
- : [],
+ ];
+
+const transport = pino.transport({
+ targets,
});
export const logger = pino(transport);
diff --git a/packages/queue/src/utils.ts b/packages/queue/src/utils.ts
index 3c2881bff..fbdf7c1ce 100644
--- a/packages/queue/src/utils.ts
+++ b/packages/queue/src/utils.ts
@@ -1,13 +1,9 @@
import type { Queue } from 'bullmq';
-import { redis } from '../../redis';
-
export async function findJobByPrefix<T>(
queue: Queue<T, any, string>,
matcher: string
) {
- const prefix = `bull:${queue.name}:`;
- const keys = await redis.keys(`${prefix}${matcher}*`);
- const key = keys.findLast((key) => !key.endsWith(':logs'));
- return key ? await queue.getJob(key.replace(prefix, '')) : undefined;
+ const delayed = await queue.getJobs('delayed');
+ return delayed.find((job) => job.opts.jobId?.startsWith(matcher));
}