From e2481ccb60183f0d990cfa9cfdf170f1d9ff3d6d Mon Sep 17 00:00:00 2001 From: Ildar Nurislamov Date: Fri, 26 Jan 2024 15:58:51 +0400 Subject: [PATCH] fix --- services/rotor/src/lib/entity-store.ts | 7 +------ webapps/console/pages/api/admin/export/[name]/index.ts | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/rotor/src/lib/entity-store.ts b/services/rotor/src/lib/entity-store.ts index 66ecf897b..c2d71b114 100644 --- a/services/rotor/src/lib/entity-store.ts +++ b/services/rotor/src/lib/entity-store.ts @@ -38,7 +38,7 @@ const refreshFunc = headers["If-Modified-Since"] = ifModifiedSince.toUTCString(); } try { - const res = await fetch(`${repositoryBase}/${storeId}?timeoutMs=10000&listen=1`, { + const res = await fetch(`${repositoryBase}/${storeId}`, { method: "GET", headers: headers, agent: await (repositoryBase.startsWith("https://") ? httpsAgent : httpAgent).waitInit(), @@ -58,11 +58,6 @@ const refreshFunc = if (lmString) { lastModified = new Date(lmString); } - //print all headers - res.headers.forEach((value, name) => { - log.atInfo().log(`${storeId} header: ${name}: ${value}`); - }); - log.atInfo().log(`${storeId} lm: (${lmString}/${res.headers.get("last-modified")})`); log.atInfo().log(`${storeId} updated: ${lastModified} previous update date: ${ifModifiedSince}`); return { store: { diff --git a/webapps/console/pages/api/admin/export/[name]/index.ts b/webapps/console/pages/api/admin/export/[name]/index.ts index b88c902fb..7c361c8e7 100644 --- a/webapps/console/pages/api/admin/export/[name]/index.ts +++ b/webapps/console/pages/api/admin/export/[name]/index.ts @@ -352,7 +352,7 @@ export default createRoute() if (query.listen) { //fake implementation of long polling, switch to pg NOTIFY later await new Promise(resolve => setTimeout(resolve, query.timeoutMs)); - lastModified = await exp.lastModified(); + lastModified = (await exp.lastModified()) || safeLastModified; if (notModified(ifModifiedSince, lastModified)) { res.writeHead(304, { "Last-Modified": lastModified.toUTCString() }); res.end();