test: add shared redis instances in examples

bee-queue · Feb 5, 2024 · fb9a649 · fb9a649
1 parent 4156a2a
commit fb9a649
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/example/bull.js b/example/bull.js
@@ -1,4 +1,5 @@
 const express = require('express');
+const IORedis = require('ioredis');
 const path = require('path');
 const Arena = require('../');
 const Bull = require('bull');
@@ -8,7 +9,19 @@ const HTTP_SERVER_PORT = 4735;
 const REDIS_SERVER_PORT = 6379;
 
 async function main() {
-  const queue = new Bull('name_of_my_queue', {
+  const queueName1 = 'name_of_my_queue_1';
+  const connection = new IORedis({port: REDIS_SERVER_PORT});
+
+  const createClient = (type) => {
+    switch (type) {
+      case 'client':
+        return connection;
+      default:
+        return new IORedis({port: REDIS_SERVER_PORT});
+    }
+  };
+
+  const queue = new Bull(queueName1, {
     redis: {
       port: REDIS_SERVER_PORT,
     },
@@ -42,7 +55,7 @@ async function main() {
       queues: [
         {
           // Required for each queue definition.
-          name: 'name_of_my_queue',
+          name: queueName1,
 
           // User-readable display name for the host. Required.
           hostId: 'Queue Server 1',
@@ -55,6 +68,20 @@ async function main() {
             port: REDIS_SERVER_PORT,
           },
         },
+        {
+          // Required for each queue definition.
+          name: 'name_of_my_queue_2',
+
+          // User-readable display name for the host. Required.
+          hostId: 'Queue Server 2',
+
+          // Queue type (Bull or Bee - default Bull).
+          type: 'bull',
+
+          redis: {
+            createClient,
+          },
+        },
       ],
       customJsPath: 'http://localhost:4735/example.js',
     },

diff --git a/example/bullmq.js b/example/bullmq.js
@@ -1,4 +1,5 @@
 const Arena = require('../');
+const IORedis = require('ioredis');
 const {Queue, Worker, FlowProducer} = require('bullmq');
 
 // Select ports that are unlikely to be used by other services a developer might be running locally.
@@ -9,6 +10,8 @@ async function main() {
   const queueName = 'name_of_my_queue';
   const parentQueueName = 'name_of_my_parent_queue';
 
+  const connection = new IORedis({port: REDIS_SERVER_PORT});
+
   const queue = new Queue(queueName, {
     connection: {port: REDIS_SERVER_PORT},
   });
@@ -87,10 +90,7 @@ async function main() {
           // Queue type (Bull or Bullmq or Bee - default Bull).
           type: 'bullmq',
 
-          redis: {
-            // host: 'localhost',
-            port: REDIS_SERVER_PORT,
-          },
+          redis: connection,
         },
         {
           // Required for each queue definition.

diff --git a/src/server/queue/index.js b/src/server/queue/index.js
@@ -106,9 +106,6 @@ class Queues {
       queue = new Bee(name, options);
       queue.IS_BEE = true;
     } else if (isBullMQ) {
-      if (queueConfig.createClient)
-        options.createClient = queueConfig.createClient;
-
       const {BullMQ} = this._config;
       const {redis, ...rest} = options;
       queue = new BullMQ(name, {