use log-helper fileScope, minor lint fix

[squeep-amqp-helper] / lib / publisher.js

diff --git a/lib/publisher.js b/lib/publisher.js
index 453b575734ff6a83529689681c716e376e8f9649..19987f1fb37abc76d0f02dcbf9d666112242c0b4 100644 (file)
--- a/lib/publisher.js
+++ b/lib/publisher.js
@@ -1,8 +1,8 @@
 'use strict';
 const Base = require('./base');
-const common = require('./common');
+const { fileScope } = require('@squeep/log-helper');
 
-const _fileScope = common.fileScope(__filename);
+const _fileScope = fileScope(__filename);
 
 class Publisher extends Base {
   constructor(logger, options) {
@@ -32,7 +32,11 @@ class Publisher extends Base {
     }
 
     const timestamp = (new Date()).getTime();
-    options = Object.assign({ timestamp }, Publisher.publishDefaults, options);
+    options = {
+      timestamp,
+      ...Publisher.publishDefaults,
+      ...options,
+    };
 
     return new Promise((resolve, reject) => {
       if (!this.keepSending) {