Minor refactor

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 17.0.3
+
+- Dedupe channel poole ready check
+- Remove unnecessary subscription config from busy publisher example
+
 ## 17.0.2
 
 - Update guidesmiths references to onebeyond.

examples/busy-publisher/config.json

@@ -28,11 +28,6 @@
             "persistent": false
           }
         }
-      },
-      "subscriptions": {
-        "demo_sub": {
-          "queue": "demo_q"
-        }
       }
     }
   }

lib/amqp/Vhost.js

@@ -201,7 +201,8 @@ function Vhost(vhostConfig, components) {
           createChannelWhenInitialised(options.confirm, (err, channel) => {
             if (err) return deferRejection(reject, err);
             if (!channel) return deferRejection(reject, new Error('Vhost is shutting down'));
-            const destroyChannel = _.once(() => {
+            const destroyChannel = _.once((err) => {
+              console.log('Destroying channel', err);
               debug('Destroying %s channel: %s for vhost: %s due to error or close event', mode, channel._rascal_id, vhostConfig.name);
               channel._rascal_closed = true;
               if (pool.isBorrowedResource(channel)) {
@@ -289,11 +290,7 @@ function Vhost(vhostConfig, components) {
         .catch((err) => {
           debug('Error releasing %s channel: %s. %s', mode, channel._rascal_id, err.message);
         })
-        .then(() => {
-          if (poolQueue.length() > 0 || !busy) return;
-          busy = false;
-          self.emit('ready', stats());
-        });
+        .then(() => checkReady());
     }
 
     function destroy(channel) {
@@ -303,11 +300,13 @@ function Vhost(vhostConfig, components) {
         .catch((err) => {
           debug('Error destroying %s channel: %s. %s', mode, channel._rascal_id, err.message);
         })
-        .then(() => {
-          if (poolQueue.length() > 0 || !busy) return;
-          busy = false;
-          self.emit('ready', stats());
-        });
+        .then(() => checkReady());
+    }
+
+    function checkReady() {
+      if (poolQueue.length() > 0 || !busy) return;
+      busy = false;
+      self.emit('ready', stats());
     }
 
     function drain(next) {