Log objects rather than JSON stringified objects

Author: spenthil

spec/FileLoggerAdapter.spec.js

@@ -62,7 +62,7 @@ describe('verbose logs', () => {
         level: 'verbose'
       });
     }).then((results) => {
-      expect(results[1].message.includes('"password": "********"')).toEqual(true);
+      expect(results[1].body.password).toEqual("********");
       var headers = {
         'X-Parse-Application-Id': 'test',
         'X-Parse-REST-API-Key': 'rest'
@@ -77,7 +77,7 @@ describe('verbose logs', () => {
           size: 100,
           level: 'verbose'
         }).then((results) => {
-          expect(results[1].message.includes('password=********')).toEqual(true);
+          expect(results[1].url.includes('password=********')).toEqual(true);
           done();
         });
       });
@@ -95,7 +95,7 @@ describe('verbose logs', () => {
         level: 'verbose'
       });
     }).then((results) => {
-      expect(results[1].message.includes('"password": "pw"')).toEqual(true);
+      expect(results[1].body.password).toEqual("pw");
       done();
     });
   });

src/PromiseRouter.js

@@ -155,14 +155,18 @@ export default class PromiseRouter {
 function makeExpressHandler(promiseHandler) {
   return function(req, res, next) {
     try {
-      log.verbose(req.method, maskSensitiveUrl(req), req.headers,
-                  JSON.stringify(maskSensitiveBody(req), null, 2));
+      log.verbose('Got request', {
+        method: req.method,
+        url: maskSensitiveUrl(req),
+        headers: req.headers,
+        body: maskSensitiveBody(req)
+      });
       promiseHandler(req).then((result) => {
         if (!result.response && !result.location && !result.text) {
           log.error('the handler did not include a "response" or a "location" field');
           throw 'control should not get here';
         }
-        log.verbose(JSON.stringify(result, null, 2));
+        log.verbose('Generated response', {result: result});
 
         var status = result.status || 200;
         res.status(status);
@@ -186,11 +190,11 @@ function makeExpressHandler(promiseHandler) {
         }
         res.json(result.response);
       }, (e) => {
-        log.verbose('error:', e);
+        log.verbose('Error generating response', {error: e});
         next(e);
       });
     } catch (e) {
-      log.verbose('exception:', e);
+      log.verbose('Error handling request', {error: e});
       next(e);
     }
   }

src/index.js

@@ -1,4 +1,3 @@
-import winston           from 'winston';
 import ParseServer       from './ParseServer';
 import S3Adapter         from 'parse-server-s3-adapter'
 import FileSystemAdapter from 'parse-server-fs-adapter'

src/logger.js

@@ -31,7 +31,9 @@ function generateTransports(level) {
   if (!process.env.TESTING || process.env.VERBOSE) {
     transports = [new (winston.transports.Console)({
       colorize: true,
-      level:level
+      level: level,
+      json: true,
+      stringify: true
     })].concat(transports);
   }
   return transports;