Skip to content

FIX 1338: Error object is not parsed or printed #1527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crowleym wants to merge 2 commits into from
Closed

FIX 1338: Error object is not parsed or printed #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b828812
FIX 1338: Error object is not parsed or printed
Nov 7, 2018
4ceea9f
Cover more options: log.log(error, Error()), log.error(Error()), log.…
Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/winston/create-logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ class DerivedLogger extends Logger {
return;
}

//Handle Error Objects
const errorMapper = o => o instanceof Error ? { message : o.message || 'Error', stack : o.stack} : o;

// Define prototype methods for each log level
// e.g. logger.log('info', msg) <––> logger.info(msg) & logger.isInfoEnabled()
// this is not an arrow function so it'll always be called on the instance instead of a fixed place in the prototype chain.
this[level] = function (...args) {
// Optimize the hot-path which is the single object.
if (args.length === 1) {
const [msg] = args;
const [msg] = args.map(errorMapper);
const info = msg && msg.message && msg || { message: msg };
info.level = info[LEVEL] = level;
this.write(info);
Expand Down
6 changes: 5 additions & 1 deletion lib/winston/logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ class Logger extends Transform {
return this;
}

//Handle Error Objects
const errorMapper = o => o instanceof Error ? { message : o.message || 'Error', stack : o.stack} : o;
msg = errorMapper(msg);

// Slightly less hotpath, but worth optimizing for.
if (arguments.length === 2) {
if (msg && typeof msg === 'object') {
Expand All @@ -171,7 +175,7 @@ class Logger extends Transform {

const [meta] = splat;
if (typeof meta === 'object' && meta !== null) {
this.write(Object.assign({}, meta, {
this.write(Object.assign({}, errorMapper(meta), {
[LEVEL]: level,
[SPLAT]: splat.slice(1),
level,
Expand Down