[[FEAT]] Make node 6 compatible (#39)

* [[CHORE]] Prepare node6 env * [[FIX]] DEV formatter for node6 * [[FIX]] JSON format for node > 6 * [[FIX]] pipe format for node > 6 * [[CHORE]] lintint
telefonicaid · May 3, 2017 · 972fbe5 · 972fbe5
1 parent 25f91ec
commit 972fbe5
Show file tree

Hide file tree

Showing 7 changed files with 2,543 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: node_js
 sudo: false
 node_js:
-  - "0.10"
-  - "0.12"
-  - "4"
-  - "5"
-script: 
+  - "6"
+  - "7"
+script:
   - "npm run travis"
   - "npm run lint"
 cache:

diff --git a/lib/formatters.js b/lib/formatters.js
@@ -155,7 +155,12 @@ function formatTrace(level, context, message, args, err) {
         recontext[key] = context[key] || notAvailable;
       });
 
-  recontext.msg = message;
+  if (message instanceof Date || message instanceof Error) {
+    // Node6 related hack. See https://github.com/telefonicaid/logops/issues/36
+    recontext.msg = util.format(message);
+  } else {
+    recontext.msg = message;
+  }
 
   var str = Object.keys(recontext)
       .map(function(key) {

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   "main": "lib/logops",
   "typings": "./lib/logops.d.ts",
   "engines": {
-    "node": ">=0.10.8 <6"
+    "node": ">=6"
   },
   "scripts": {
     "travis": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec test/environment.js test/*.spec.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage && tsc --noEmit",

diff --git a/test/format.dev.spec.js b/test/format.dev.spec.js
@@ -86,7 +86,7 @@ describe('Development format', function() {
     it('should log dates', function() {
       var now = new Date();
       logger.info({}, now);
-      expect(logger._lastTrace).to.be.eql('INFO  ' + now);
+      expect(logger._lastTrace).to.be.eql('INFO  1970-01-01T00:00:00.000Z');
     });
 
     it('should nothing but context with a Data as context', function() {
@@ -191,8 +191,9 @@ describe('Development format', function() {
     });
 
     it('should log extra errors', function() {
-      logger.info('Format', new Error('foo'));
-      expect(logger._lastTrace).to.be.eql(pad('INFO  Format [Error: foo]'));
+      var error = new Error('foo');
+      logger.info('Format', error);
+      expect(logger._lastTrace).to.be.eql(pad('INFO  Format ' +  error.stack));
     });
 
     it('should log errors with extra information without stacktrace', function() {

diff --git a/test/format.json.spec.js b/test/format.json.spec.js
@@ -55,7 +55,7 @@ describe('JSON format', function() {
         var now = new Date();
         logger.info({}, now);
         expect(logger._lastTrace).to.be.eql(JSON.stringify({time: '1970-01-01T00:00:00.000Z', lvl: 'INFO',
-          msg: '' + now
+          msg: '1970-01-01T00:00:00.000Z'
         }));
       });
 
@@ -244,9 +244,10 @@ describe('JSON format', function() {
     });
 
     it('should log extra errors', function() {
-      logger.info('Format', new Error('foo'));
+      var error = new Error('foo');
+      logger.info('Format', error);
       expect(logger._lastTrace).to.be.eql(JSON.stringify({time: '1970-01-01T00:00:00.000Z', lvl: 'INFO',
-        msg: 'Format [Error: foo]'
+        msg: 'Format ' + error.stack
       }));
     });
 

diff --git a/test/format.pipe.spec.js b/test/format.pipe.spec.js
@@ -82,7 +82,7 @@ describe('Pipe format', function() {
       var now = new Date();
       logger.info({}, now);
       expect(logger._lastTrace).to.be.eql(
-          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=' + now
+          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=1970-01-01T00:00:00.000Z'
       );
     });
 
@@ -141,16 +141,18 @@ describe('Pipe format', function() {
     });
 
     it('should log extra errors', function() {
-      logger.info('Format', new Error('foo'));
+      var error = new Error('foo');
+      logger.info('Format', error);
       expect(logger._lastTrace).to.be.eql(
-          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=Format [Error: foo]'
+          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=Format ' + error.stack
       );
     });
 
     it('should log errors with extra information', function() {
-      logger.info(new Error('foo'), 'Format %s', 'works');
+      var error = new Error('foo');
+      logger.info(error, 'Format %s', 'works');
       expect(logger._lastTrace).to.be.eql(
-          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=Format works [Error: foo]'
+          'time=1970-01-01T00:00:00.000Z | lvl=INFO | corr=n/a | trans=n/a | op=n/a | msg=Format works ' + error.stack
       );
     });