From 428a92f1d0a4f4a6027179da433964aa103595a0 Mon Sep 17 00:00:00 2001 From: Max Korinets Date: Mon, 2 Apr 2018 18:18:43 +0300 Subject: [PATCH 1/2] Fix error detail tests --- test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test.js b/test.js index 30fb3aa..e769b19 100755 --- a/test.js +++ b/test.js @@ -52,6 +52,7 @@ describe('tasu: options set', () => { tasu.listen('request.error.detail', (message) => { const error = Error('service error'); error.detail = 'error detail'; + delete error.message; throw error; }); done(); @@ -89,7 +90,7 @@ describe('tasu: options set', () => { try { await tasu.request('request.error.detail', {foo: 'bar'}); } catch (error) { - assert.equal(error.message, 'service error'); + assert.equal(error.message, 'error detail'); assert.isOk(error.requestId); } }); From 55653e5b430f0c19a55ed3fb3f8b1eb85dc4c316 Mon Sep 17 00:00:00 2001 From: Max Korinets Date: Mon, 2 Apr 2018 18:34:34 +0300 Subject: [PATCH 2/2] 4.0.1 --- CHANGELOG.md | 6 ++++++ lib/logger.js | 6 ++++-- package-lock.json | 7 +------ package.json | 3 +-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc51cc..0004ecb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +[4.0.1] - 2018-04-02 +-------------------- +- [x] Fix error detail tests +- [x] Drop `moment` dependency + + [4.0.0] - 2018-04-02 -------------------- - [x] Remove `respond` callback from `listen` diff --git a/lib/logger.js b/lib/logger.js index cc87464..42ea86a 100755 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,5 +1,4 @@ const winston = require('winston'); -const moment = require('moment'); const screenPassword = require('./screenPassword'); @@ -13,7 +12,10 @@ module.exports = function (group, format) { transports: [ new (winston.transports.Console)({ level: process.env.NATS_LOG_LEVEL || 'debug', - timestamp: function () { return moment().toISOString() }, + timestamp: function () { + const now = new Date(); + return now.toISOString() + }, formatter, stderrLevels: ['error'] }) diff --git a/package-lock.json b/package-lock.json index 67de718..75d1df3 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tasu", - "version": "4.0.0", + "version": "4.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -663,11 +663,6 @@ "supports-color": "3.1.2" } }, - "moment": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", - "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==" - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", diff --git a/package.json b/package.json index 6f3a0d7..19bb332 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tasu", - "version": "4.0.0", + "version": "4.0.1", "description": "A NATS-based message transport for Node.js services", "main": "index.js", "scripts": { @@ -32,7 +32,6 @@ "homepage": "https://github.com/yentsun/tasu", "dependencies": { "lodash": "^4.17.5", - "moment": "^2.21.0", "nats": "^0.7.29", "trid": "^0.1.0", "winston": "^2.4.1"