bullmq 1.48.1 → 1.48.2

package/dist/commands/drain-4.lua

@@ -8,25 +8,26 @@
     KEYS[3] 'delayed'
     KEYS[4] 'priority'
 
-    ARGV[1]  queue key prefix,
+    ARGV[1]  queue key prefix
 ]]
 local rcall = redis.call
+local queueBaseKey = ARGV[1]
 
-local function delete_item (list, queuePrefix)
-  for _, v in ipairs(list) do
-    rcall("DEL", queuePrefix .. v)
+local function removeJobs (list)
+  for _, id in ipairs(list) do
+    rcall("DEL", queueBaseKey .. id)
   end
 end
 
 local wait_ids = rcall("LRANGE", KEYS[1] , 0, -1)
 local paused_ids = rcall("LRANGE", KEYS[2] , 0, -1)
 
-delete_item(wait_ids, ARGV[1])
-delete_item(paused_ids, ARGV[1])
+removeJobs(wait_ids)
+removeJobs(paused_ids)
 
 if KEYS[3] ~= "" then
   local delayed_ids = rcall("ZRANGE", KEYS[3] , 0, -1)
-  delete_item(delayed_ids, ARGV[1])
+  removeJobs(delayed_ids)
   rcall("DEL", KEYS[3])
 end
 

package/dist/commands/obliterate-2.lua

@@ -32,25 +32,26 @@ local function getSetItems(keyName, max)
     return rcall('SMEMBERS', keyName, 0, max)
 end
 
-local function removeJobs(parentKey, keys)
+local function removeJobs(keys)
     for i, key in ipairs(keys) do
-        rcall("DEL", baseKey .. key)
-        rcall("DEL", baseKey .. key .. ':logs')
-        rcall("DEL", baseKey .. key .. ':dependencies')
-        rcall("DEL", baseKey .. key .. ':processed')
+        local jobKey = baseKey .. key 
+        rcall("DEL", jobKey)
+        rcall("DEL", jobKey .. ':logs')
+        rcall("DEL", jobKey .. ':dependencies')
+        rcall("DEL", jobKey .. ':processed')
     end
     maxCount = maxCount - #keys
 end
 
 local function removeListJobs(keyName, max)
     local jobs = getListItems(keyName, max)
-    removeJobs(keyName, jobs)
+    removeJobs(jobs)
     rcall("LTRIM", keyName, #jobs, -1)
 end
 
 local function removeZSetJobs(keyName, max)
     local jobs = getZSetItems(keyName, max)
-    removeJobs(keyName, jobs)
+    removeJobs(jobs)
     if(#jobs > 0) then
         rcall("ZREM", keyName, unpack(jobs))
     end
@@ -77,7 +78,7 @@ if (#activeJobs > 0) then
 end
 
 removeLockKeys(activeJobs)
-removeJobs(activeKey, activeJobs)
+removeJobs(activeJobs)
 rcall("LTRIM", activeKey, #activeJobs, -1)
 if(maxCount <= 0) then
     return 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bullmq",
-  "version": "1.48.1",
+  "version": "1.48.2",
   "description": "Queue for messages and jobs based on Redis",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",