Merge pull request #330 from roggervalf/feature-retry-delayed-jobs

Retry bulk delayed jobs

example/README.md

@@ -1,6 +1,6 @@
 ## Overview
 
-This is a simple demonstration of how to run Arena and connect it to [Bee Queue](https://github.com/mixmaxhq/bee-queue).
+This is a simple demonstration of how to run Arena and connect it to [Bee Queue](https://github.com/mixmaxhq/bee-queue) or [Bull Queue](https://github.com/OptimalBits/bull).
 
 ## Requirements
 
@@ -13,6 +13,10 @@ This is a simple demonstration of how to run Arena and connect it to [Bee Queue]
 
 ## Running
 
-`npm start`
+`npm start:bee`
+
+or
+
+`npm start:bull`
 
 Then open http://localhost:4735/ in your browser.

example/bull.js

@@ -0,0 +1,46 @@
+const Arena = require('../');
+const Bull = require('bull');
+const RedisServer = require('redis-server');
+
+// Select ports that are unlikely to be used by other services a developer might be running locally.
+const HTTP_SERVER_PORT = 4735;
+const REDIS_SERVER_PORT = 4736;
+
+// Create a Redis server. This is only for convenience
+
+async function main() {
+  const server = new RedisServer(REDIS_SERVER_PORT);
+  await server.open();
+
+  Arena(
+    {
+      Bull,
+
+      queues: [
+        {
+          // Required for each queue definition.
+          name: 'name_of_my_queue',
+
+          // User-readable display name for the host. Required.
+          hostId: 'Queue Server 1',
+
+          // Queue type (Bull or Bee - default Bull).
+          type: 'bull',
+
+          redis: {
+            // host: 'localhost',
+            port: REDIS_SERVER_PORT,
+          },
+        },
+      ],
+    },
+    {
+      port: HTTP_SERVER_PORT,
+    }
+  );
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

example/package.json

@@ -2,15 +2,17 @@
   "name": "arena-example-project",
   "version": "1.0.0",
   "description": "An example project that uses Arena",
-  "main": "index.js",
+  "main": "bee.js",
   "scripts": {
-    "start": "node index.js",
+    "start:bee": "node bee.js",
+    "start:bull": "node bull.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
   "license": "MIT",
   "dependencies": {
     "bee-queue": "^1.3.1",
+    "bull": "^3.20.1",
     "express": "^4.17.1",
     "redis-server": "^1.2.2"
   }

src/server/views/dashboard/queueJobsByState.js

@@ -123,6 +123,7 @@ async function _html(req, res) {
     pages.push(_.last(pages) + 1);
   }
   pages = pages.filter((page) => page <= _.ceil(jobCounts[state] / pageSize));
+  const disableRetry = !(state === 'failed' || (state === 'delayed' && !queue.IS_BEE));
 
   return res.render('dashboard/templates/queueJobsByState', {
     basePath,
@@ -133,6 +134,7 @@ async function _html(req, res) {
     jobsInStateCount: jobCounts[state],
     disablePagination: queue.IS_BEE && (state === 'succeeded' || state === 'failed'),
     disableOrdering: queue.IS_BEE,
+    disableRetry,
     currentPage: page,
     pages,
     pageSize,

src/server/views/dashboard/templates/queueJobsByState.hbs

@@ -50,12 +50,12 @@
       data-queue-state="{{ state }}" class="js-bulk-action btn btn-danger">
       Remove Jobs
     </button>
-    {{#eq state 'failed'}}
+    {{#unless disableRetry}}
     <button type="button" data-action="retry" data-queue-name="{{ queueName }}" data-queue-host="{{ queueHost }}"
       data-queue-state="{{ state }}" class="js-bulk-action btn btn-success">
       Retry Jobs
     </button>
-    {{/eq}}
+    {{/unless}}
 
     <div class="btn-group">
       <div class="btn-group">