Skip to content

Commit

Permalink
Issue #63: factor the source timestamps in server logger to top-level…
Browse files Browse the repository at this point in the history
… context keys.
  • Loading branch information
fgm committed Aug 16, 2018
1 parent 2736d6e commit 1be62f7
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 15,060 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ filog*.tgz

# Version lock files
npm-shrinkwrap.json
package-lock.json
yarn.lock
5 changes: 3 additions & 2 deletions lib/ServerLogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,15 @@ var ServerLogger = function (_Logger) {
var sourceDetails = context[_Logger3.default.KEY_DETAILS],
ignoredSource = context[_Logger3.default.KEY_SOURCE],
ignoredHostName = context[_Logger3.default.KEY_HOST],
context1 = _objectWithoutProperties(context, [_Logger3.default.KEY_DETAILS, _Logger3.default.KEY_SOURCE, _Logger3.default.KEY_HOST]);
timestamps = context[_Logger3.default.KEY_TS],
context1 = _objectWithoutProperties(context, [_Logger3.default.KEY_DETAILS, _Logger3.default.KEY_SOURCE, _Logger3.default.KEY_HOST, _Logger3.default.KEY_TS]);

// In case of conflict, argument details overwrites caller details.


var mergedDetails = _extends({}, sourceDetails, details);

var context2 = _extends({}, _get(ServerLogger.prototype.__proto__ || Object.getPrototypeOf(ServerLogger.prototype), "buildContext", this).call(this, mergedDetails, source), (_extends2 = {}, _defineProperty(_extends2, source, context1), _defineProperty(_extends2, _Logger3.default.KEY_HOST, this.hostname), _extends2));
var context2 = _extends({}, _get(ServerLogger.prototype.__proto__ || Object.getPrototypeOf(ServerLogger.prototype), "buildContext", this).call(this, mergedDetails, source), (_extends2 = {}, _defineProperty(_extends2, source, context1), _defineProperty(_extends2, _Logger3.default.KEY_HOST, this.hostname), _defineProperty(_extends2, _Logger3.default.KEY_TS, _defineProperty({}, source, timestamps)), _extends2));

return context2;
}
Expand Down
Loading

0 comments on commit 1be62f7

Please sign in to comment.