tryForLeader failure emits an error rather than throws (#1137)

actionhero · Dec 23, 2024 · 7fff34b · 7fff34b
1 parent f08ed43
commit 7fff34b
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/src/core/scheduler.ts b/src/core/scheduler.ts
@@ -170,25 +170,30 @@ export class Scheduler extends EventEmitter {
       return;
     }
 
-    const lockedByMe = await this.connection.redis.set(
-      leaderKey,
-      this.options.name,
-      "EX",
-      this.options.leaderLockTimeout,
-      "NX",
-    );
-
-    if (lockedByMe && lockedByMe.toUpperCase() === "OK") {
-      return true;
-    }
-
-    const currentLeaderName = await this.connection.redis.get(leaderKey);
-    if (currentLeaderName === this.options.name) {
-      await this.connection.redis.expire(
+    try {
+      const lockedByMe = await this.connection.redis.set(
         leaderKey,
+        this.options.name,
+        "EX",
         this.options.leaderLockTimeout,
+        "NX",
       );
-      return true;
+
+      if (lockedByMe && lockedByMe.toUpperCase() === "OK") {
+        return true;
+      }
+
+      const currentLeaderName = await this.connection.redis.get(leaderKey);
+      if (currentLeaderName === this.options.name) {
+        await this.connection.redis.expire(
+          leaderKey,
+          this.options.leaderLockTimeout,
+        );
+        return true;
+      }
+    } catch (error) {
+      this.emit("error", error);
+      return false;
     }
 
     return false;