Fat arrow

Author: Marvel Mathew

lib/index.js

@@ -82,22 +82,23 @@ class Subscriber extends events.EventEmitter {
     }
 
     topic.subscribe(subscriptionName, (err, subscription) => {
-
       if (err) {
         console.error(`Failed to create subscription ${err}`);
         return;
       }
 
       console.log(`Subscription ${subscription.name} created.`);
 
-      function deleteSubscription() {
+      const deleteSubscription = () => {
         removeListeners();
-        console.log('Subscriber: Signal received, deleting subscription');
-        subscription.delete().then(() => {
-          console.log('Subscriber: subscription deleted...');
-        }, (err) => {
-          console.error(`Subscriber: Error deleting subscription`, err);
-        });
+        if (!this.disableFanOut) {
+          console.log('Subscriber: Signal received, deleting subscription');
+          subscription.delete().then(() => {
+            console.log('Subscriber: subscription deleted...');
+          }, (err) => {
+            console.error(`Subscriber: Error deleting subscription`, err);
+          });
+        }
       }
 
       function messageHandler(message) {
@@ -127,17 +128,13 @@ class Subscriber extends events.EventEmitter {
         subscription.removeListener('message', onMessage);
         subscription.removeListener('error', onError);
 
-        if (!this.disableFanOut) {
-          process.removeListener('SIGTERM', deleteSubscription);
-          process.removeListener('SIGINT', deleteSubscription);
-        }
+        process.removeListener('SIGTERM', deleteSubscription);
+        process.removeListener('SIGINT', deleteSubscription);
       }
 
       // Handle termination, delete the subscription (require graceful shutdowm)
-      if (!this.disableFanOut) {
-        process.on('SIGTERM', deleteSubscription);
-        process.on('SIGINT', deleteSubscription);
-      }
+      process.on('SIGTERM', deleteSubscription);
+      process.on('SIGINT', deleteSubscription);
 
       // Bind the subscription
       subscription.on('message', onMessage);