Skip to content

Open-source status page, incident response and uptime monitoring

fix: external status caching (#2176)

Colin Ozanne737a960baa8c
diff --git a/apps/web/src/app/(landing)/status/[id]/page.tsx b/apps/web/src/app/(landing)/status/[id]/page.tsx
index 58e414d16..57907452c 100644
--- a/apps/web/src/app/(landing)/status/[id]/page.tsx
+++ b/apps/web/src/app/(landing)/status/[id]/page.tsx
@@ -4,10 +4,7 @@ import { Suspense } from "react";
import { ExternalServicePill } from "@/app/(landing)/status/external-service-pill";
import { env } from "@/env";
-import {
- cachedGetExternalServiceBySlug,
- cachedListExternalServiceSlugs,
-} from "@/lib/external-service-cache";
+import { cachedGetExternalServiceBySlug } from "@/lib/external-service-cache";
import {
BASE_URL,
defaultMetadata,
@@ -20,16 +17,10 @@ import { formatRelative, getStatusAnswer, isStale } from "../utils";
import { HistoryBars } from "./history-bars";
import { Incidents } from "./incidents";
-export const revalidate = 60;
-export const dynamicParams = true;
+export const dynamic = "force-dynamic";
const HISTORY_DAYS = 45;
-export async function generateStaticParams() {
- const { canonical } = await cachedListExternalServiceSlugs();
- return canonical.map((id) => ({ id }));
-}
-
type RouteParams = { id: string };
export async function generateMetadata(args: {
diff --git a/apps/web/src/app/api/og/external-service/route.tsx b/apps/web/src/app/api/og/external-service/route.tsx
index 2826edb7b..0f81f7269 100644
--- a/apps/web/src/app/api/og/external-service/route.tsx
+++ b/apps/web/src/app/api/og/external-service/route.tsx
@@ -12,6 +12,7 @@ import { cn } from "@/lib/utils";
import { SIZE } from "../utils";
export const runtime = "edge";
+export const dynamic = "force-dynamic";
const FOOTER = "openstatus.dev/status";
const INDEX_TITLE = "External Status";
diff --git a/apps/web/src/lib/external-service-cache.ts b/apps/web/src/lib/external-service-cache.ts
index bf7ba848a..8350fc3f3 100644
--- a/apps/web/src/lib/external-service-cache.ts
+++ b/apps/web/src/lib/external-service-cache.ts
@@ -1,11 +1,10 @@
import {
getExternalServiceBySlug,
- listExternalServiceSlugs,
listExternalServices,
} from "@openstatus/services/external-service";
import { unstable_cache } from "next/cache";
-const REVALIDATE_SECONDS = 3600; // 1 hour
+const REVALIDATE_SECONDS = 60;
const TAG = "external-services";
export const cachedListExternalServices = unstable_cache(
@@ -14,12 +13,6 @@ export const cachedListExternalServices = unstable_cache(
{ revalidate: REVALIDATE_SECONDS, tags: [TAG] },
);
-export const cachedListExternalServiceSlugs = unstable_cache(
- async () => listExternalServiceSlugs(),
- ["external-services:slugs"],
- { revalidate: REVALIDATE_SECONDS, tags: [TAG] },
-);
-
export const cachedGetExternalServiceBySlug = unstable_cache(
async (slug: string) => getExternalServiceBySlug({ slug }),
["external-services:by-slug"],
diff --git a/packages/tinybird/endpoints/endpoint_external_status.pipe b/packages/tinybird/endpoints/endpoint__external_status.pipe
similarity index 100%
rename from packages/tinybird/endpoints/endpoint_external_status.pipe
rename to packages/tinybird/endpoints/endpoint__external_status.pipe
diff --git a/packages/tinybird/endpoints/endpoint_external_status_history__v0.pipe b/packages/tinybird/endpoints/endpoint__external_status_history__v0.pipe
similarity index 100%
rename from packages/tinybird/endpoints/endpoint_external_status_history__v0.pipe
rename to packages/tinybird/endpoints/endpoint__external_status_history__v0.pipe
diff --git a/packages/tinybird/endpoints/endpoint_external_status_latest__v1.pipe b/packages/tinybird/endpoints/endpoint__external_status_latest__v1.pipe
similarity index 100%
rename from packages/tinybird/endpoints/endpoint_external_status_latest__v1.pipe
rename to packages/tinybird/endpoints/endpoint__external_status_latest__v1.pipe
diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.ts
index 0bc19c0a6..89b8fcc3f 100644
--- a/packages/tinybird/src/client.ts
+++ b/packages/tinybird/src/client.ts
@@ -1796,7 +1796,7 @@ export class OSTinybird {
updated_at: z.int(),
last_fetched_at: z.int(),
}),
- opts: { next: { revalidate: PUBLIC_CACHE } },
+ opts: { next: { revalidate: REVALIDATE } },
});
}