fix(lock): fix early release of lock

isomerpages · Mar 31, 2024 · 8f811e8 · 8f811e8
1 parent 1c4b7ea
commit 8f811e8
Showing 1 changed file with 65 additions and 57 deletions.
diff --git a/src/middleware/routeHandler.ts b/src/middleware/routeHandler.ts
@@ -138,6 +138,7 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
   const { growthbook } = req
 
   if (!growthbook) {
+    console.log("in error")
     next(new Error("GrowthBook instance is undefined."))
     return
   }
@@ -151,6 +152,7 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
   if (!isGitAvailable) return
   try {
     await lock(siteName)
+    console.log(`locked ${siteName}`)
   } catch (err) {
     next(err)
     return
@@ -180,12 +182,14 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
 
     if (results.isErr()) {
       await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
       next(results.error)
       return
     }
     const [stagingResult, stagingLiteResult] = results.value
     if (!stagingResult.sha || !stagingLiteResult.sha) {
       await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
       return
     }
 
@@ -205,12 +209,14 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
 
     if (result.isErr()) {
       await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
       next(result.error)
       return
     }
 
     if (!result.value.sha) {
       await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
       return
     }
 
@@ -237,6 +243,7 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
       originalStagingCommitSha = currentStgCommitSha
     } catch (err) {
       await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
       logger.error(
         `Failed to rollback repo ${siteName}: ${JSON.stringify(err)}`
       )
@@ -245,78 +252,79 @@ export const attachRollbackRouteHandlerWrapper: RouteWrapper<
     }
   }
 
-  Promise.resolve(routeHandler(req, res, next)).catch(async (err: Error) => {
-    try {
-      if (shouldUseGitFileSystem) {
-        await backOff(
-          () =>
-            convertNeverThrowToPromise(
-              gitFileSystemService.rollback(
-                siteName,
-                originalStagingCommitSha,
-                STAGING_BRANCH
-              )
-            ),
-          backoffOptions
-        )
-
-        if (shouldCheckStagingLite) {
-          // for quickie sites
+  Promise.resolve(routeHandler(req, res, next))
+    .then(async () => {
+      await unlock(siteName)
+      console.log(`unlocked ${siteName}`)
+    })
+    .catch(async (err: Error) => {
+      try {
+        if (shouldUseGitFileSystem) {
           await backOff(
             () =>
               convertNeverThrowToPromise(
                 gitFileSystemService.rollback(
                   siteName,
-                  originalStagingLiteCommitSha,
-                  STAGING_LITE_BRANCH
+                  originalStagingCommitSha,
+                  STAGING_BRANCH
                 )
               ),
             backoffOptions
           )
-        }
 
-        await backOff(() => {
-          let pushRes = gitFileSystemService.push(
-            siteName,
-            STAGING_BRANCH,
-            true
-          )
-          if (originalStagingLiteCommitSha) {
-            pushRes = pushRes.andThen(() =>
-              gitFileSystemService.push(siteName, STAGING_LITE_BRANCH, true)
+          if (shouldCheckStagingLite) {
+            // for quickie sites
+            await backOff(
+              () =>
+                convertNeverThrowToPromise(
+                  gitFileSystemService.rollback(
+                    siteName,
+                    originalStagingLiteCommitSha,
+                    STAGING_LITE_BRANCH
+                  )
+                ),
+              backoffOptions
             )
           }
 
-          return convertNeverThrowToPromise(pushRes)
-        }, backoffOptions)
-      } else {
-        // Github flow
-        await backOff(
-          () =>
-            revertCommit(
-              originalStagingCommitSha,
+          await backOff(() => {
+            let pushRes = gitFileSystemService.push(
               siteName,
-              accessToken,
-              STAGING_BRANCH
-            ),
-          backoffOptions
+              STAGING_BRANCH,
+              true
+            )
+            if (originalStagingLiteCommitSha) {
+              pushRes = pushRes.andThen(() =>
+                gitFileSystemService.push(siteName, STAGING_LITE_BRANCH, true)
+              )
+            }
+
+            return convertNeverThrowToPromise(pushRes)
+          }, backoffOptions)
+        } else {
+          // Github flow
+          await backOff(
+            () =>
+              revertCommit(
+                originalStagingCommitSha,
+                siteName,
+                accessToken,
+                STAGING_BRANCH
+              ),
+            backoffOptions
+          )
+        }
+      } catch (retryErr) {
+        await unlock(siteName)
+        console.log(`unlocked ${siteName}`)
+        logger.error(
+          `Failed to rollback repo ${siteName}: ${JSON.stringify(retryErr)}`
         )
+        next(retryErr)
+        return
       }
-    } catch (retryErr) {
       await unlock(siteName)
-      logger.error(
-        `Failed to rollback repo ${siteName}: ${JSON.stringify(retryErr)}`
-      )
-      next(retryErr)
-      return
-    }
-    await unlock(siteName)
-    next(err)
-  })
-
-  try {
-    await unlock(siteName)
-  } catch (err) {
-    next(err)
-  }
+      console.log(`unlocked ${siteName}`)
+      next(err)
+    })
 }