feat: inject log instance into SQS class and update logging methods to use it

Author: agnusha

packages/serverless-offline-sqs/src/index.js

@@ -12,8 +12,6 @@ const {
   toPairs
 } = require('lodash/fp');
 
-const log = require('@serverless/utils/log').log;
-
 const SQS = require('./sqs');
 
 const OFFLINE_OPTION = 'serverless-offline';
@@ -32,12 +30,13 @@ const defaultOptions = {
 const omitUndefined = omitBy(isUndefined);
 
 class ServerlessOfflineSQS {
-  constructor(serverless, cliOptions) {
+  constructor(serverless, cliOptions, { log }) {
     this.cliOptions = null;
     this.options = null;
     this.sqs = null;
     this.lambda = null;
     this.serverless = null;
+    this.log = log;
 
     this.cliOptions = cliOptions;
     this.serverless = serverless;
@@ -67,7 +66,7 @@ class ServerlessOfflineSQS {
 
     await Promise.all(eventModules);
 
-    this.serverless.cli.log(
+    this.log.notice(
       `Starting Offline SQS at stage ${this.options.stage} (${this.options.region})`
     );
   }
@@ -83,7 +82,7 @@ class ServerlessOfflineSQS {
 
     signals.map(signal =>
       process.on(signal, async () => {
-        this.serverless.cli.log(`Got ${signal} signal. Offline Halting...`);
+        this.log.notice(`Got ${signal} signal. Offline Halting...`);
 
         await this.end();
       })
@@ -100,7 +99,7 @@ class ServerlessOfflineSQS {
       return;
     }
 
-    this.serverless.cli.log('Halting offline server');
+    this.log.notice('Halting offline server');
 
     const eventModules = [];
 
@@ -129,7 +128,7 @@ class ServerlessOfflineSQS {
   async _createSqs(events, skipStart) {
     const resources = this._getResources();
 
-    this.sqs = new SQS(this.lambda, resources, this.options);
+    this.sqs = new SQS(this.lambda, resources, this.options, this.log);
 
     await this.sqs.create(events);
 
@@ -155,7 +154,7 @@ class ServerlessOfflineSQS {
       omitUndefined(this.cliOptions)
     );
 
-    log.debug('options:', this.options);
+    this.log.debug('options:', this.options);
   }
 
   _getEvents() {

packages/serverless-offline-sqs/src/sqs.js

@@ -11,7 +11,6 @@ const {
   toString,
   values
 } = require('lodash/fp');
-const log = require('@serverless/utils/log').log;
 const {default: PQueue} = require('p-queue');
 const SQSEventDefinition = require('./sqs-event-definition');
 const SQSEvent = require('./sqs-event');
@@ -22,10 +21,11 @@ const delay = timeout =>
   });
 
 class SQS {
-  constructor(lambda, resources, options) {
+  constructor(lambda, resources, options, log) {
     this.lambda = null;
     this.resources = null;
     this.options = null;
+    this.log = log;
 
     this.lambda = lambda;
     this.resources = resources;
@@ -138,7 +138,7 @@ class SQS {
             )
           );
         } catch (err) {
-          log.warning(err.stack);
+          this.log.warning(err.stack);
         }
       }
 
@@ -170,7 +170,7 @@ class SQS {
     } catch (err) {
       if (remainingTry > 0 && err.name === 'AWS.SimpleQueueService.NonExistentQueue')
         return this._createQueue({queueName}, remainingTry - 1);
-      log.warning(err.stack);
+      this.log.warning(err.stack);
     }
   }
 }