update lock logic

gitcoinco · Sep 9, 2024 · a2dd60e · a2dd60e
1 parent 16ae5b4
commit a2dd60e
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/src/database/index.ts b/src/database/index.ts
@@ -121,31 +121,37 @@ export class Database {
     const ipfsDataLockId = generateLockId(this.ipfsDataSchemaName);
     const priceDataLockId = generateLockId(this.priceDataSchemaName);
 
+    // Lock acquisition status
+    let chainDataLockAcquired = false;
+    let ipfsDataLockAcquired = false;
+    let priceDataLockAcquired = false;
+
     try {
-      const chainDataLockAcquired = await acquireLockForSchema(chainDataLockId);
-      const ipfsDataLockAcquired = await acquireLockForSchema(ipfsDataLockId);
-      const priceDataLockAcquired = await acquireLockForSchema(priceDataLockId);
-
-      if (
-        chainDataLockAcquired &&
-        ipfsDataLockAcquired &&
-        priceDataLockAcquired
-      ) {
-        return {
-          release: async () => {
+      chainDataLockAcquired = await acquireLockForSchema(chainDataLockId);
+      ipfsDataLockAcquired = await acquireLockForSchema(ipfsDataLockId);
+      priceDataLockAcquired = await acquireLockForSchema(priceDataLockId);
+
+      return {
+        release: async () => {
+          if (chainDataLockAcquired)
             await releaseLockForSchema(chainDataLockId);
-            await releaseLockForSchema(ipfsDataLockId);
+          if (ipfsDataLockAcquired) await releaseLockForSchema(ipfsDataLockId);
+          if (priceDataLockAcquired)
             await releaseLockForSchema(priceDataLockId);
-            client.release();
-          },
-          client,
-        };
-      }
+          client.release();
+        },
+        client,
+      };
     } catch (error) {
       this.#logger.error({ error }, "Failed to acquire write lock");
-    }
+    } finally {
+      // Ensure any acquired locks are released if they were not all acquired
+      if (chainDataLockAcquired) await releaseLockForSchema(chainDataLockId);
+      if (ipfsDataLockAcquired) await releaseLockForSchema(ipfsDataLockId);
+      if (priceDataLockAcquired) await releaseLockForSchema(priceDataLockId);
 
-    client.release();
+      client.release();
+    }
 
     return null;
   }