Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Check Queues
on:
schedule:
- cron: '*/5 * * * *'
on: []

env:
BULL_AUTH_KEY: ${{ secrets.BULL_AUTH_KEY }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Clean Every 30 Minutes Before 24h Completed Jobs
on:
schedule:
- cron: '30 * * * *'
on: []

env:
BULL_AUTH_KEY: ${{ secrets.BULL_AUTH_KEY }}
Expand Down
61 changes: 0 additions & 61 deletions apps/api/src/controllers/v0/admin/queue.ts
Original file line number Diff line number Diff line change
@@ -1,68 +1,7 @@
import { Request, Response } from "express";

import { Job } from "bullmq";
import { Logger } from "../../../lib/logger";
import { getScrapeQueue } from "../../../services/queue-service";
import { checkAlerts } from "../../../services/alerts";

export async function cleanBefore24hCompleteJobsController(
req: Request,
res: Response
) {
Logger.info("🐂 Cleaning jobs older than 24h");
try {
const scrapeQueue = getScrapeQueue();
const batchSize = 10;
const numberOfBatches = 9; // Adjust based on your needs
const completedJobsPromises: Promise<Job[]>[] = [];
for (let i = 0; i < numberOfBatches; i++) {
completedJobsPromises.push(
scrapeQueue.getJobs(
["completed"],
i * batchSize,
i * batchSize + batchSize,
true
)
);
}
const completedJobs: Job[] = (
await Promise.all(completedJobsPromises)
).flat();
const before24hJobs =
completedJobs.filter(
(job) => job.finishedOn < Date.now() - 24 * 60 * 60 * 1000
) || [];

let count = 0;

if (!before24hJobs) {
return res.status(200).send(`No jobs to remove.`);
}

for (const job of before24hJobs) {
try {
await job.remove();
count++;
} catch (jobError) {
Logger.error(`🐂 Failed to remove job with ID ${job.id}: ${jobError}`);
}
}
return res.status(200).send(`Removed ${count} completed jobs.`);
} catch (error) {
Logger.error(`🐂 Failed to clean last 24h complete jobs: ${error}`);
return res.status(500).send("Failed to clean jobs");
}
}

export async function checkQueuesController(req: Request, res: Response) {
try {
await checkAlerts();
return res.status(200).send("Alerts initialized");
} catch (error) {
Logger.debug(`Failed to initialize alerts: ${error}`);
return res.status(500).send("Failed to initialize alerts");
}
}

// Use this as a "health check" that way we dont destroy the server
export async function queuesController(req: Request, res: Response) {
Expand Down
16 changes: 1 addition & 15 deletions apps/api/src/routes/admin.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import express from "express";
import { redisHealthController } from "../controllers/v0/admin/redis-health";
import {
checkQueuesController,
cleanBefore24hCompleteJobsController,
queuesController,
} from "../controllers/v0/admin/queue";
import { queuesController } from "../controllers/v0/admin/queue";

export const adminRouter = express.Router();

Expand All @@ -13,14 +9,4 @@ adminRouter.get(
redisHealthController
);

adminRouter.get(
`/admin/${process.env.BULL_AUTH_KEY}/clean-before-24h-complete-jobs`,
cleanBefore24hCompleteJobsController
);

adminRouter.get(
`/admin/${process.env.BULL_AUTH_KEY}/check-queues`,
checkQueuesController
);

adminRouter.get(`/admin/${process.env.BULL_AUTH_KEY}/queues`, queuesController);
52 changes: 0 additions & 52 deletions apps/api/src/services/alerts/index.ts

This file was deleted.