fix: ensure consumers are called at the right time (#9)

fullcube · Jan 6, 2017 · 9fd422f · 9fd422f
1 parent 467c995
commit 9fd422f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -35,7 +35,6 @@ module.exports = function loopbackComponentMq(app, config) {
     // If we have a datasource, wire up Rabbit and setup Queues
     if (ds && dsOptions) {
       Queue.rabbit = new Rabbit(dsOptions)
-      RabbitTopology.setupQueues(Queue)
       RabbitTopology.setupTopology(Queue)
     }
 

diff --git a/lib/rabbit-topology.js b/lib/rabbit-topology.js
@@ -12,16 +12,6 @@ module.exports = function rabbitTopology() {
     msqQueue = QueueModel.rabbit.exchange.queue({ name, durable: true })
   }
 
-  function setupQueues(Model) {
-    QueueModel = Model
-
-    // Loop through all the defined queues
-    _.forEach(QueueModel.topology, (handlers, queue) => {
-      // Setup the actual queue on RabbitMQ
-      setupQueue(queue)
-    })
-  }
-
   function setupQueueConsumer(app, queue, definition) {
     debug('setupQueueConsumer')
     const modelName = definition.model
@@ -41,10 +31,7 @@ module.exports = function rabbitTopology() {
     }
 
     // Start consuming the queue
-    if (msqQueue) {
-      msqQueue.consume(Method)
-    }
-
+    msqQueue.consume(Method)
 
     debug('setupQueueConsumer: queue: %s, model: %s, method: %s', queue, modelName, methodName)
   }
@@ -62,12 +49,7 @@ module.exports = function rabbitTopology() {
 
     Model[methodName] = function queueProducer(params) {
       debug(`${modelName}.${methodName}(%o)`, params)
-      if (QueueModel.rabbit && QueueModel.rabbit.exchange) {
-        QueueModel.rabbit.exchange.publish(params, { key: queue })
-      }
-      else {
-        debug('setupQueueProducer: queue %s is not yet initialised', queue)
-      }
+      QueueModel.rabbit.exchange.publish(params, { key: queue })
     }
   }
 
@@ -77,6 +59,9 @@ module.exports = function rabbitTopology() {
     // Loop through all the defined queues
     _.forEach(QueueModel.topology, (handlers, queue) => {
 
+      // Setup the actual queue on RabbitMQ
+      setupQueue(queue)
+
       // Setup the consumer of this queue
       if (handlers.consumer) {
         setupQueueConsumer(QueueModel.app, queue, handlers.consumer)
@@ -112,7 +97,6 @@ module.exports = function rabbitTopology() {
 
   return {
     setupQueue,
-    setupQueues,
     setupTopology,
     setupQueueProducer,
     setupQueueConsumer,