Adds silent option to disable console output

Author: flovilmart

spec/Logger.spec.js

@@ -14,17 +14,18 @@ describe('Logger', () => {
     });
     spyOn(testTransport, 'log');
     logging.addTransport(testTransport);
+    expect(Object.keys(logging.logger.transports).length).toBe(4);
     logging.logger.info('hi');
     expect(testTransport.log).toHaveBeenCalled();
     logging.removeTransport(testTransport);
-    expect(Object.keys(logging.logger.transports).length).toBe(2);
+    expect(Object.keys(logging.logger.transports).length).toBe(3);
   });
 
   it('should have files transports', (done) => {
     reconfigureServer().then(() => {
       let transports = logging.logger.transports;
       let transportKeys = Object.keys(transports);
-      expect(transportKeys.length).toBe(2);
+      expect(transportKeys.length).toBe(3);
       done();
     });
   });
@@ -35,24 +36,23 @@ describe('Logger', () => {
     }).then(() => {
       let transports = logging.logger.transports;
       let transportKeys = Object.keys(transports);
-      expect(transportKeys.length).toBe(0);
+      expect(transportKeys.length).toBe(1);
       done();
     });
   });
 
   it('should enable JSON logs', (done) => {
     // Force console transport
-    process.env.VERBOSE=1;
     reconfigureServer({
       logsFolder: null,
-      jsonLogs: true
+      jsonLogs: true,
+      silent: false
     }).then(() => {
       let spy = spyOn(process.stdout, 'write');
       logging.logger.info('hi', {key: 'value'});
       expect(process.stdout.write).toHaveBeenCalled();
       var firstLog = process.stdout.write.calls.first().args[0];
       expect(firstLog).toEqual(JSON.stringify({key: 'value', level: 'info', message: 'hi' })+'\n');
-      delete process.env.VERBOSE;
       return reconfigureServer({
         jsonLogs: false
       });

spec/helper.js

@@ -46,6 +46,7 @@ var defaultConfiguration = {
   webhookKey: 'hook',
   masterKey: 'test',
   fileKey: 'test',
+  silent: true,
   push: {
     'ios': {
       cert: 'prodCert.pem',

src/Adapters/Logger/WinstonLogger.js

@@ -11,6 +11,8 @@ const additionalTransports = [];
 function updateTransports(options) {
   let transports = Object.assign({}, logger.transports);
   if (options) {
+    let silent = options.silent;
+    delete options.silent;
     if (_.isNull(options.dirname)) {
       delete transports['parse-server'];
       delete transports['parse-server-error'];
@@ -28,15 +30,12 @@ function updateTransports(options) {
         }, options));
     }
 
-    if (!process.env.TESTING || process.env.VERBOSE) {
-      transports.console = new (winston.transports.Console)(
-        Object.assign({
-          colorize: true,
-          name: 'console'
-        }, options));
-    } else {
-      delete transports['console'];
-    }
+    transports.console = new (winston.transports.Console)(
+      Object.assign({
+        colorize: true,
+        name: 'console',
+        silent
+      }, options));
   }
   // Mount the additional transports
   additionalTransports.forEach((transport) => {
@@ -51,7 +50,8 @@ export function configureLogger({
   logsFolder = defaults.logsFolder,
   jsonLogs = defaults.jsonLogs,
   logLevel = winston.level,
-  verbose = defaults.verbose } = {}) {
+  verbose = defaults.verbose,
+  silent = defaults.silent } = {}) {
 
   if (verbose) {
     logLevel = 'verbose';
@@ -70,6 +70,8 @@ export function configureLogger({
   }
   options.dirname = logsFolder;
   options.level = logLevel;
+  options.silent = silent;
+
   if (jsonLogs) {
     options.json = true;
     options.stringify = true;

src/ParseServer.js

@@ -107,6 +107,7 @@ class ParseServer {
     logsFolder = logging.defaults.logsFolder,
     verbose = logging.defaults.verbose,
     logLevel = logging.defaults.level,
+    silent = logging.defaults.silent,
     databaseURI,
     databaseOptions,
     databaseAdapter,
@@ -179,7 +180,7 @@ class ParseServer {
     // Pass the push options too as it works with the default
     const pushControllerAdapter = loadAdapter(push && push.adapter, ParsePushAdapter, push || {});
 
-    const loggerControllerAdapter = loadAdapter(loggerAdapter, WinstonLoggerAdapter, { jsonLogs, logsFolder, verbose, logLevel });
+    const loggerControllerAdapter = loadAdapter(loggerAdapter, WinstonLoggerAdapter, { jsonLogs, logsFolder, verbose, logLevel, silent });
 
     logging.setLogger(loggerControllerAdapter);
 

src/cli/cli-definitions.js

@@ -201,6 +201,9 @@ export default {
     env: "PARSE_SERVER_LOGS_FOLDER",
     help: "Folder for the logs (defaults to './logs')",
   },
+  "silent": {
+    help: "Disables console output",
+  },
   "revokeSessionOnPasswordReset": {
     env: "PARSE_SERVER_REVOKE_SESSION_ON_PASSWORD_RESET",
     help: "When a user changes their password, either through the reset password email or while logged in, all sessions are revoked if this is true. Set to false if you don't want to revoke sessions.",

src/logger.js

@@ -19,7 +19,8 @@ export const defaults = {
   jsonLogs: process.env.JSON_LOGS || false,
   logsFolder,
   verbose,
-  level
+  level,
+  silent: false
 }
 
 export function setLogger(aLogger) {