diff --git a/package-lock.json b/package-lock.json index a33b4ea..8f6760e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1582,7 +1582,8 @@ "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true }, "lodash._baseassign": { "version": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", diff --git a/package.json b/package.json index ec7942e..682f0ac 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "chalk": "2.3.0", "cls-hooked": "4.2.2", "event-stream": "3.3.4", - "lodash": "4.17.4", "uuid": "3.1.0" }, "devDependencies": { diff --git a/src/logger/logger.js b/src/logger/logger.js index 1b96f05..f6f0c9d 100644 --- a/src/logger/logger.js +++ b/src/logger/logger.js @@ -2,20 +2,26 @@ const config = require('../config'); const continuationLocalStorage = require('cls-hooked'); -const _ = require('lodash'); const STACK_TRACE_LIMIT = 4000; const Timer = require('../timer/timer'); +const getContextStorage = function() { + const contextNamespace = continuationLocalStorage.getNamespace('session'); + + if (contextNamespace && contextNamespace.active) { + const { id, _ns_name, ...contextData } = contextNamespace.active; + return contextData; + } + + return {}; +}; + const logMethodFactory = function(level) { return function(action, data) { if (!this._enabled) { return; } - const contextNamespace = continuationLocalStorage.getNamespace('session'); - const contextStorage = (contextNamespace && contextNamespace.active) ? - _.omit(contextNamespace.active, 'id', '_ns_name') : {}; - console.log(JSON.stringify(Object.assign( { name: this._namespace, @@ -23,7 +29,7 @@ const logMethodFactory = function(level) { level: config.levels[level].number, time: new Date().toISOString() }, - contextStorage, + getContextStorage(), data ))); }