From 7964d20c232ffd837b6c0ae3598312df08f41ebe Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Sep 2016 09:49:11 -0400 Subject: [PATCH 1/2] Reproduction of #2639 --- spec/WinstonLoggerAdapter.spec.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spec/WinstonLoggerAdapter.spec.js b/spec/WinstonLoggerAdapter.spec.js index fa813756f1..b739c0270f 100644 --- a/spec/WinstonLoggerAdapter.spec.js +++ b/spec/WinstonLoggerAdapter.spec.js @@ -16,11 +16,19 @@ describe('info logs', () => { }, (results) => { if (results.length == 0) { fail('The adapter should return non-empty results'); - done(); } else { expect(results[0].message).toEqual('testing info logs'); - done(); } + // Check the error log + // Regression #2639 + winstonLoggerAdapter.query({ + from: new Date(Date.now() - 500), + size: 100, + level: 'error' + }, (results) => { + expect(results.length).toEqual(0); + done(); + }); }); }); }); From dd4c22bd770f07ebe70b21c75e74e20ea62af56e Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Sep 2016 09:49:40 -0400 Subject: [PATCH 2/2] Make sure the error level options is enforced --- src/Adapters/Logger/WinstonLogger.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Adapters/Logger/WinstonLogger.js b/src/Adapters/Logger/WinstonLogger.js index 2015908b30..29d4a07ca7 100644 --- a/src/Adapters/Logger/WinstonLogger.js +++ b/src/Adapters/Logger/WinstonLogger.js @@ -18,16 +18,15 @@ function updateTransports(options) { delete transports['parse-server-error']; } else if (!_.isUndefined(options.dirname)) { transports['parse-server'] = new (DailyRotateFile)( - Object.assign({ + Object.assign({}, { filename: 'parse-server.info', name: 'parse-server', }, options)); transports['parse-server-error'] = new (DailyRotateFile)( - Object.assign({ + Object.assign({}, { filename: 'parse-server.err', name: 'parse-server-error', - level: 'error' - }, options)); + }, options, { level: 'error'})); } transports.console = new (winston.transports.Console)(