From df0babea7d5f2d9a4d446bd5e8d61f3781db7af4 Mon Sep 17 00:00:00 2001 From: Thibault Le Ouay Date: Mon, 31 Jul 2023 19:38:22 +0200 Subject: [PATCH] hotfix cron job (#110) --- apps/web/src/app/api/checker/cron/10m/route.ts | 2 +- apps/web/src/app/api/checker/cron/1h/route.ts | 2 +- apps/web/src/app/api/checker/cron/30m/route.ts | 2 +- apps/web/src/app/api/checker/cron/5m/route.ts | 2 +- apps/web/src/app/api/checker/cron/_cron.ts | 9 +++++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/web/src/app/api/checker/cron/10m/route.ts b/apps/web/src/app/api/checker/cron/10m/route.ts index d036e328..4130ea55 100644 --- a/apps/web/src/app/api/checker/cron/10m/route.ts +++ b/apps/web/src/app/api/checker/cron/10m/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; import { cron, isAuthorizedDomain } from "../_cron"; -export const runtime = "edge"; +// export const runtime = "edge"; export const preferredRegion = ["auto"]; export const dynamic = "force-dynamic"; diff --git a/apps/web/src/app/api/checker/cron/1h/route.ts b/apps/web/src/app/api/checker/cron/1h/route.ts index 97c3461f..47c67e64 100644 --- a/apps/web/src/app/api/checker/cron/1h/route.ts +++ b/apps/web/src/app/api/checker/cron/1h/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; import { cron, isAuthorizedDomain } from "../_cron"; -export const runtime = "edge"; +// export const runtime = "edge"; export const preferredRegion = ["auto"]; export const dynamic = "force-dynamic"; diff --git a/apps/web/src/app/api/checker/cron/30m/route.ts b/apps/web/src/app/api/checker/cron/30m/route.ts index 606acefa..2607befa 100644 --- a/apps/web/src/app/api/checker/cron/30m/route.ts +++ b/apps/web/src/app/api/checker/cron/30m/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; import { cron, isAuthorizedDomain } from "../_cron"; -export const runtime = "edge"; +// export const runtime = "edge"; export const preferredRegion = ["auto"]; export const dynamic = "force-dynamic"; diff --git a/apps/web/src/app/api/checker/cron/5m/route.ts b/apps/web/src/app/api/checker/cron/5m/route.ts index 97d7f0af..f717ab2e 100644 --- a/apps/web/src/app/api/checker/cron/5m/route.ts +++ b/apps/web/src/app/api/checker/cron/5m/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; import { cron, isAuthorizedDomain } from "../_cron"; -export const runtime = "edge"; +// export const runtime = "edge"; export const preferredRegion = ["auto"]; export const dynamic = "force-dynamic"; diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.ts index 99c277ed..d7fa2022 100644 --- a/apps/web/src/app/api/checker/cron/_cron.ts +++ b/apps/web/src/app/api/checker/cron/_cron.ts @@ -38,6 +38,8 @@ export const cron = async ({ .where(and(eq(monitor.periodicity, periodicity), eq(monitor.active, true))) .all(); + const allResult = []; + for (const row of result) { // could be improved with a single query const allPages = await db @@ -55,10 +57,11 @@ export const cron = async ({ pageIds: allPages.map((p) => String(p.pageId)), }; - await c.publishJSON({ + const result = c.publishJSON({ url: `${DEFAULT_URL}/api/checker/regions/${region}`, body: payload, }); + allResult.push(result); } } // our first legacy monitor @@ -73,10 +76,12 @@ export const cron = async ({ pageIds: ["openstatus"], }; - await c.publishJSON({ + const result = c.publishJSON({ url: `${DEFAULT_URL}/api/checker/regions/${region}`, body: payload, }); + allResult.push(result); } } + await Promise.all(allResult); }; -- 2.51.2