From b7426abf858ea6a744f1e074d5405104fa4b98ff Mon Sep 17 00:00:00 2001 From: maretol Date: Sun, 9 Feb 2025 12:15:18 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BB=BD=E5=BA=A6=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cms-cache-purger/src/index.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cms-cache-purger/src/index.ts b/cms-cache-purger/src/index.ts index 05021c2..995c306 100644 --- a/cms-cache-purger/src/index.ts +++ b/cms-cache-purger/src/index.ts @@ -80,12 +80,7 @@ async function deleteContentsCache(env: Env) { async function deleteContentCache(env: Env, contentID: string) { const cacheKey = generateContentKey(contentID) - const cache = await env.CMS_CACHE.get(cacheKey) - if (!cache) { - // キャッシュがなかったのでパス - return - } - await env.CMS_CACHE.delete(cacheKey) + await deleteCache(env, cacheKey) } async function deleteCache(env: Env, cacheKey: string) { From 1bf7fcab1d38e32d1d893e2205595969d160d9f4 Mon Sep 17 00:00:00 2001 From: maretol Date: Sun, 9 Feb 2025 21:31:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9E=E5=90=8C=E6=9C=9F=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=AE=E6=9B=B8=E3=81=8D=E6=96=B9=E3=81=AE=E3=83=9F?= =?UTF-8?q?=E3=82=B9=E3=81=AB=E6=B0=97=E3=81=A5=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cms-cache-purger/src/index.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cms-cache-purger/src/index.ts b/cms-cache-purger/src/index.ts index 995c306..b5d8edb 100644 --- a/cms-cache-purger/src/index.ts +++ b/cms-cache-purger/src/index.ts @@ -68,10 +68,16 @@ export default { async function deleteContentsCache(env: Env) { const list = await env.CMS_CACHE.list({ prefix: 'contents_' }) // すべての contents_ から始まるキーを削除する - list.keys.forEach(async (key) => { - await env.CMS_CACHE.delete(key.name) - console.log(`delete cache: ${key.name}`) + const deleteKeys = await Promise.all( + list.keys.map(async (key) => { + await env.CMS_CACHE.delete(key.name) + return key.name + }) + ) + deleteKeys.forEach((key) => { + console.log(`Deleted: ${key}`) }) + if (list.list_complete === false) { // キャッシュがまだある場合は再帰的に削除する await deleteContentsCache(env)