Merge pull request #1 from Buzzertech/fix/remove-publisher

Fix/remove publisher
Buzzertech · Oct 7, 2018 · 731b98e · 731b98e
2 parents 79afc9e + e228329
commit 731b98e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/src/Pubsub.ts b/src/Pubsub.ts
@@ -1,29 +1,16 @@
 let subscriber: any;
-let publisher: any;
 
 export default new class PubSub {
-    init (Subscriber: any, Publisher: any) {
+    init (Subscriber: any) {
         if (typeof Subscriber === undefined) {
             throw new Error ('Please provide a new redis instance for subscribe')
         }
 
-        if (typeof Publisher === undefined) {
-            throw new Error ('Please provide a new redis instance for publisher')
-        }
-
         subscriber = Subscriber;
-        publisher = Publisher;
-    }
-
-    publish(channel: string, message: string) {
-        if (typeof publisher.publish === undefined) {
-            throw new Error('The provided redis client doesn\'t supports publishing messages');
-        }
-        publisher.publish(channel, message);
     }
 
     subscribe(channel: string) {
-        if (typeof publisher.subscribe === undefined) {
+        if (typeof subscriber.subscribe === undefined) {
             throw new Error('The provided redis client doesn\'t supports subscribing to messages');
         }
 

diff --git a/src/queue.ts b/src/queue.ts
@@ -6,8 +6,6 @@ export interface IQueueOpts {
     redis: any;
     /** A separate instance of redis to subscribe to events internally */
     subscriberRedis: any;
-    /** A separate instance of redis to publish events internally */
-    publisherRedis: any;
     /** Default retries is set to 4 */
     maxRetries?: number;
 }
@@ -34,11 +32,7 @@ export class Queue {
             throw new Error('Subscriber Redis Client Not provided');
         }
 
-        if (typeof this.opts.publisherRedis === undefined) {
-            throw new Error('Publisher Redis Client Not Provided');
-        }
-
-        Pubsub.init(this.opts.subscriberRedis, this.opts.publisherRedis);
+        Pubsub.init(this.opts.subscriberRedis);
     }
 
     public registerNamespace(namespace: string, handler: (namespace:string, ctx: any) => any): any {

diff --git a/test/index.js b/test/index.js
@@ -11,8 +11,6 @@ describe('JerryQuu', () => {
     let testEmailQueue;
     const redis = Redis.createClient();
     const subscriberRedis = sinon.stub(Redis.createClient());
-    const publisherRedis = Redis.createClient();
-
 
     beforeEach(function () {
         const transport = Nodemailer.createTransport({
@@ -23,7 +21,6 @@ describe('JerryQuu', () => {
         testEmailQueue = new EmailQueue({
             redis,
             subscriberRedis,
-            publisherRedis,
             maxRetries: 2,
             transport: transport
         });
@@ -47,7 +44,6 @@ describe('JerryQuu', () => {
         try {
             new EmailQueue({
                 redis: redis,
-                publisherRedis: Redis.createClient(),
                 maxRetries: 2,
                 transport: Nodemailer.createTransport({
                     host: '127.0.0.1',
@@ -59,22 +55,6 @@ describe('JerryQuu', () => {
         }
     });
 
-    it('throws an error if publisher redis instance not passed', () => {
-        try {
-            new EmailQueue({
-                redis: redis,
-                subscriberRedis: Redis.createClient(),
-                maxRetries: 2,
-                transport: Nodemailer.createTransport({
-                    host: '127.0.0.1',
-                    port: '587'
-                })
-            });
-        } catch (err) {
-            expect(err.message).to.equal('Publisher Redis Client Not Provided');
-        }
-    });
-
     it('throw an error if namespace not provided', () => {
         try {
             testEmailQueue.registerNamespace();
@@ -157,7 +137,6 @@ describe('JerryQuu', () => {
     it('set custom maxRetries', () => {
         const emailQueue = new EmailQueue({
             maxRetries: 5,
-            publisherRedis: publisherRedis,
             subscriberRedis: subscriberRedis,
             redis: redis,
             transport: Nodemailer.createTransport({