diff --git a/apps/redis-api/src/routes/api/cache.ts b/apps/redis-api/src/routes/api/cache.ts index fcdccc09c..2416f232e 100644 --- a/apps/redis-api/src/routes/api/cache.ts +++ b/apps/redis-api/src/routes/api/cache.ts @@ -16,7 +16,7 @@ export const cacheRoutes = new Elysia({ prefix: "/cache" }) "/", async ({ query: { key }, status }) => { key = validateKey(key); - cacheRouteLogger.info(`GET /cache ${key}`); + cacheRouteLogger.debug(`GET /cache ${key}`); const value = await redis.get(key); if (!value) { @@ -48,9 +48,12 @@ export const cacheRoutes = new Elysia({ prefix: "/cache" }) "/", async ({ query: { key }, body, status, set }) => { key = validateKey(key); - cacheRouteLogger.info(`PUT /cache ${key}`); + cacheRouteLogger.debug(`PUT /cache ${key}`); if (!body.ttl || body.ttl < 0) { + cacheRouteLogger.warn( + `PUT /cache ${key} with ttl=${body.ttl}, will not cache the data` + ); return status("Bad Request", "ttl is required"); } @@ -69,7 +72,7 @@ export const cacheRoutes = new Elysia({ prefix: "/cache" }) "/", async ({ query: { key, fuzzy } }) => { key = validateKey(key); - cacheRouteLogger.info( + cacheRouteLogger.debug( `DELETE /cache ${key} ${fuzzy ? "fuzzy" : ""}` ); const deletedKeys: number = fuzzy diff --git a/apps/scandic-web/app/api/web/revalidate/route.ts b/apps/scandic-web/app/api/web/revalidate/route.ts index 096c38a70..078735faa 100644 --- a/apps/scandic-web/app/api/web/revalidate/route.ts +++ b/apps/scandic-web/app/api/web/revalidate/route.ts @@ -119,6 +119,11 @@ export async function POST(request: NextRequest) { revalidateTag(contentEntryTag) await cacheClient.deleteKey(contentEntryTag, { fuzzy: true }) + if (entry.url) { + console.info(`Revalidating url: ${entry.url}`) + await cacheClient.deleteKey(entry.url, { fuzzy: true }) + } + if (entry.breadcrumbs) { const breadcrumbsRefsTag = generateRefsResponseTag( entryLocale, diff --git a/apps/scandic-web/docker-compose.yaml b/apps/scandic-web/docker-compose.yaml index 44169530b..9c77dd30d 100644 --- a/apps/scandic-web/docker-compose.yaml +++ b/apps/scandic-web/docker-compose.yaml @@ -12,6 +12,7 @@ services: - PRIMARY_API_KEY= - SECONDARY_API_KEY= - NODE_ENV=development + - SENTRY_ENABLED=false - SENTRY_DSN=fake-dsn - SENTRY_ENVIRONMENT=development redis: diff --git a/apps/scandic-web/services/cms/fetchAndCacheEntry.ts b/apps/scandic-web/services/cms/fetchAndCacheEntry.ts index 2beb22d20..5215c6219 100644 --- a/apps/scandic-web/services/cms/fetchAndCacheEntry.ts +++ b/apps/scandic-web/services/cms/fetchAndCacheEntry.ts @@ -10,18 +10,14 @@ export const fetchAndCacheEntry = async (path: string, lang: Lang) => { return cache.cacheOrGet( cacheKey, - async (overrideTTL) => { + async () => { const { contentType, uid } = await resolveEntry(path, lang) - if (!contentType || !uid) { - overrideTTL?.("10m") - } - return { contentType, uid, } }, - "1d" + "max" ) }