Răsfoiți Sursa

Merge pull request #7735 from overleaf/jpa-fix-hard-deletion

[web] fix result handling from project-archiver hard deletion

GitOrigin-RevId: c6d7746e5e45b05d6372e5efcc029e0b566ace2d
Timothée Alby 4 ani în urmă
părinte
comite
62075a6ba9

+ 3 - 2
services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js

@@ -113,16 +113,17 @@ async function deleteProject(options) {
   metrics.inc('tpds.delete-project')
   // send the request directly to project archiver, bypassing third-party-datastore
   try {
-    const response = await request({
+    await request({
       uri: `${settings.apis.project_archiver.url}/project/${options.project_id}`,
       method: 'delete',
     })
-    return response
+    return true
   } catch (err) {
     logger.error(
       { err, project_id: options.project_id },
       'error deleting project in third party datastore (project_archiver)'
     )
+    return false
   }
 }
 

+ 2 - 2
services/web/scripts/delete_orphaned_project_archives.js

@@ -74,10 +74,10 @@ async function hardDeleteProjectArchiverData(projectId) {
   console.log(`Destroying hard deleted project archive for ${projectId}`)
   if (DRY_RUN) return
 
-  const res = await TpdsUpdateSender.promises.deleteProject({
+  const ok = await TpdsUpdateSender.promises.deleteProject({
     project_id: projectId,
   })
-  if (!res) {
+  if (!ok) {
     throw new Error(`deletion failed for ${projectId}, check logs`)
   }
 }