Only log events after they are completely successful.

This awaits for all other tasks to be completed (including other uploads, and
even the unlocking) so downstream systems aren't hit with failed operations.

src/probation.js

@@ -34,7 +34,7 @@ export async function approveProbationHandler(request, env, nonblockers) {
 
         let latpath = pkeys.latestVersion(project, asset);
         let latest = await s3.quickFetchJson(latpath, env, { mustWork: false });
-        let is_latest = true;
+        var is_latest = true;
         if (latest !== null) {
             let latest_info = await s3.quickFetchJson(pkeys.versionSummary(project, asset, latest.version), env);
             let my_finish = Date.parse(info.upload_finished);
@@ -45,12 +45,11 @@ export async function approveProbationHandler(request, env, nonblockers) {
             await s3.quickUploadJson(latpath, { version: version }, env);
         }
 
-        await change.addChangelog({ type: "add-version", project, asset, version, latest: is_latest }, env);
-
     } finally {
         await lock.unlockProject(project, env);
     }
 
+    await change.addChangelog({ type: "add-version", project, asset, version, latest: is_latest }, env);
     return new Response(null, { status: 200 });
 }
 

src/remove.js

@@ -20,12 +20,11 @@ export async function removeProjectHandler(request, env, nonblockers) {
     try {
         // Add trailing slash to avoid deleting a project that starts with 'project'.
         await s3.quickRecursiveDelete(project + "/", env);
-
-        await change.addChangelog({ type: "delete-project", project }, env);
     } finally {
         await lock.unlockProject(project, env);
     }
 
+    await change.addChangelog({ type: "delete-project", project }, env);
     return new Response(null, { status: 200 });
 }
 
@@ -45,12 +44,11 @@ export async function removeProjectAssetHandler(request, env, nonblockers) {
         // Add trailing slash to avoid deleting an asset that starts with 'asset'.
         let freed = await s3.quickRecursiveDelete(project + "/" + asset + "/", env);
         await quot.updateQuotaOnDeletion(project, freed, env);
-
-        await change.addChangelog({ type: "delete-asset", project, asset }, env);
     } finally {
         await lock.unlockProject(project, env);
     }
 
+    await change.addChangelog({ type: "delete-asset", project, asset }, env);
     return new Response(null, { status: 200 });
 }
 
@@ -75,16 +73,15 @@ export async function removeProjectAssetVersionHandler(request, env, nonblockers
         // Need to go through and update the latest version of the asset, in case
         // we just deleted the latest version.
         let linfo = await s3.quickFetchJson(pkeys.latestVersion(project, asset), env, { mustWork: false });
-        let was_latest = (linfo !== null && linfo.version == version);
+        var was_latest = (linfo !== null && linfo.version == version);
         if (was_latest) {
             await vers.updateLatestVersion(project, asset, env);
         }
 
-        await change.addChangelog({ type: "delete-version", project, asset, version, latest: was_latest }, env);
-
     } finally {
         await lock.unlockProject(project, env);
     }
 
+    await change.addChangelog({ type: "delete-version", project, asset, version, latest: was_latest }, env);
     return new Response(null, { status: 200 });
 }

src/upload.js

@@ -403,10 +403,10 @@ export async function completeUploadHandler(request, env, nonblockers) {
             preparation.push(s3.quickUploadJson(project + "/" + asset + "/" + version + "/" + k + "..links", v, env));
         }
 
-        if (!info.on_probation) {
+        var is_official = (!info.on_probation);
+        if (is_official) {
             preparation.push(s3.quickUploadJson(pkeys.latestVersion(project, asset), { "version": version }, env));
             delete info.on_probation; 
-            preparation.push(change.addChangelog({ type: "add-version", project, asset, version, latest: true }, env));
         }
 
         info.upload_finish = (new Date).toISOString();
@@ -423,8 +423,10 @@ export async function completeUploadHandler(request, env, nonblockers) {
         await Promise.all(preparation);
     }
 
-    // Release lock once we're clear.
     await lock.unlockProject(project, env);
+    if (is_official) {
+        preparation.push(change.addChangelog({ type: "add-version", project, asset, version, latest: true }, env));
+    }
     return new Response(null, { status: 200 });
 }