Fix DatabaseQueue deadlock

alchemy-swift · Oct 1, 2021 · c64f073 · c64f073
1 parent dd95663
commit c64f073
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Sources/Alchemy/Queue/Drivers/DatabaseQueue.swift b/Sources/Alchemy/Queue/Drivers/DatabaseQueue.swift
@@ -30,7 +30,7 @@ final class DatabaseQueue: QueueDriver {
                 .forLock(.update, option: .skipLocked)
                 .firstModel()
 
-            return try await job?.update {
+            return try await job?.update(db: conn) {
                 $0.reserved = true
                 $0.reservedAt = Date()
             }.toJobData()

diff --git a/Sources/Alchemy/Queue/Drivers/QueueDriver.swift b/Sources/Alchemy/Queue/Drivers/QueueDriver.swift
@@ -70,7 +70,7 @@ extension QueueDriver {
                 return
             }
 
-            Log.debug("Dequeued job \(jobData.jobName) from queue \(jobData.channel)")
+            Log.debug("[Queue] dequeued job \(jobData.jobName) from queue \(jobData.channel)")
             try await execute(jobData)
             try await runNext(from: channels)
         } catch {

diff --git a/Sources/Alchemy/Queue/Queue.swift b/Sources/Alchemy/Queue/Queue.swift
@@ -47,6 +47,8 @@ public final class Queue: Service {
         pollRate: TimeAmount = Queue.defaultPollRate,
         on eventLoop: EventLoop = Loop.group.next()
     ) {
+        let loopId = ObjectIdentifier(eventLoop).debugDescription.dropLast().suffix(6)
+        Log.info("[Queue] starting worker \(loopId)")
         driver.startWorker(for: channels, pollRate: pollRate, on: eventLoop)
     }
 }