screwdriver-queue-service 3.0.4 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-queue-service",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Screwdriver Queue Service API",
   "main": "app.js",
   "directories": {

package/plugins/queue/scheduler.js

@@ -466,15 +466,6 @@ async function init(executor) {
     if (executor.multiWorker) return 'Scheduler running';
 
     const resqueConnection = { redis: executor.redis, namespace: queueNamespace };
-    const retryOptions = {
-        plugins: [Plugins.Retry],
-        pluginOptions: {
-            Retry: {
-                retryLimit: RETRY_LIMIT,
-                retryDelay: RETRY_DELAY
-            }
-        }
-    };
     // Jobs object to register the worker with
     const jobs = {
         startDelayed: {
@@ -532,13 +523,22 @@ async function init(executor) {
                         };
                     }
 
-                    return await startPeriodic(executor, fullConfig);
+                    await startPeriodic(executor, fullConfig);
                 } catch (err) {
                     logger.error(`err in startDelayed job: ${err}`);
                     throw err;
                 }
             },
-            ...retryOptions
+            plugins: [Plugins.Retry, Plugins.JobLock, Plugins.DelayQueueLock, Plugins.QueueLock],
+            pluginOptions: {
+                JobLock: {
+                    reEnqueue: false
+                },
+                Retry: {
+                    retryLimit: RETRY_LIMIT,
+                    retryDelay: RETRY_DELAY
+                }
+            }
         },
         startFrozen: {
             perform: async jobConfig => {
@@ -557,7 +557,13 @@ async function init(executor) {
                     throw err;
                 }
             },
-            ...retryOptions
+            plugins: [Plugins.Retry],
+            pluginOptions: {
+                Retry: {
+                    retryLimit: RETRY_LIMIT,
+                    retryDelay: RETRY_DELAY
+                }
+            }
         }
     };