Adds settings endpoint to configure loglevel

Author: flovilmart

spec/SettingsRouter.spec.js

@@ -0,0 +1,57 @@
+var request = require('request');
+
+var headers = {
+  'X-Parse-Application-Id': 'test',
+  'X-Parse-Master-Key': 'test'
+};
+
+
+describe('SettingsRouter', () => {
+
+  it('should set the loglevel', (done) => {
+    request.post({
+      headers: headers,
+      json: {
+        'logLevel': 'silly'
+      },
+      url: 'http://localhost:8378/1/settings'
+    }, (err, res, body) => {
+      request.get({
+        url: 'http://localhost:8378/1/settings',
+        headers: headers
+      }, (err, res, body)=> {
+        body = JSON.parse(body);
+        expect(body.logLevel).toBe('silly');
+        done();
+      });
+    });
+  });
+
+  it('should not access without masterKey', (done) => {
+    request.post({
+      headers: {
+        'X-Parse-Application-Id': 'test',
+        'X-Parse-Master-Key': 'invalid'
+      },
+      json: {
+        'logLevel': 'silly'
+      },
+      url: 'http://localhost:8378/1/settings'
+    }, (err, res, body) => {
+      expect(body.error).not.toBeUndefined();
+      expect(body.error).toBe('unauthorized');
+      request.get({
+        url: 'http://localhost:8378/1/settings',
+        headers: {
+          'X-Parse-Application-Id': 'test',
+          'X-Parse-Master-Key': 'invalid'
+        }
+      }, (err, res, body)=> {
+        body = JSON.parse(body);
+        expect(body.error).toBe('unauthorized');
+        done();
+      });
+    });
+  })
+
+})

src/ParseServer.js

@@ -46,9 +46,9 @@ import { SchemasRouter }        from './Routers/SchemasRouter';
 import { SessionsRouter }       from './Routers/SessionsRouter';
 import { UserController }       from './Controllers/UserController';
 import { UsersRouter }          from './Routers/UsersRouter';
-
+import { SettingsRouter }       from './Routers/SettingsRouter';
 import ParsePushAdapter         from 'parse-server-push-adapter';
-import winston                  from 'winston';
+
 // Mutate the Parse object to add the Cloud Code handlers
 addParseCloud();
 
@@ -152,7 +152,7 @@ class ParseServer {
     }
 
     if (verbose || process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER) {
-      winston.level = 'silly';
+      configureLogger({level: 'silly'});
     }
 
     const filesControllerAdapter = loadAdapter(filesAdapter, () => {
@@ -247,6 +247,7 @@ class ParseServer {
       new IAPValidationRouter(),
       new FeaturesRouter(),
       new GlobalConfigRouter(),
+      new SettingsRouter(),
     ];
 
     if (process.env.PARSE_EXPERIMENTAL_HOOKS_ENABLED || process.env.TESTING) {

src/Routers/LogsRouter.js

@@ -1,9 +1,11 @@
 import { Parse } from 'parse/node';
 import PromiseRouter from '../PromiseRouter';
 import * as middleware from "../middlewares";
+import winston from 'winston';
+import { logger, configureLogger } from '../logger';
 
 export class LogsRouter extends PromiseRouter {
-  
+
   mountRoutes() {
     this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest,  (req) => {
       return this.handleGET(req);
@@ -30,9 +32,9 @@ export class LogsRouter extends PromiseRouter {
     const until = req.query.until;
     let size = req.query.size;
     if (req.query.n) {
-      size = req.query.n;      
+      size = req.query.n;
     }
-    
+
     const order = req.query.order
     const level = req.query.level;
     const options = {

src/Routers/SettingsRouter.js

@@ -0,0 +1,26 @@
+import PromiseRouter from '../PromiseRouter';
+import * as middleware from "../middlewares";
+import { logger, configureLogger } from '../logger';
+import winston from 'winston';
+
+export class SettingsRouter extends PromiseRouter {
+  mountRoutes() {
+    this.route('GET', '/settings', middleware.promiseEnforceMasterKeyAccess, (req) => {
+      return Promise.resolve({
+        response: {
+          logLevel: winston.level
+        }
+      })
+    });
+    this.route('POST','/settings', middleware.promiseEnforceMasterKeyAccess, (req) => {
+      let body = req.body;
+      let logLevel = body.logLevel;
+      if (logLevel) {
+        configureLogger({level: logLevel});
+      }
+      return Promise.resolve({
+        response: body
+      })
+    });
+  }
+}

src/logger.js

@@ -11,8 +11,7 @@ if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
 
 let currentLogsFolder = LOGS_FOLDER;
 
-function generateTransports() {
-  let level = process.env.VERBOSE ? 'verbose': 'info';
+function generateTransports(level) {
   let transports = [
     new (DailyRotateFile)({
       filename: 'parse-server.info',
@@ -38,7 +37,8 @@ function generateTransports() {
 
 const logger = new winston.Logger();
 
-export function configureLogger({logsFolder}) {
+export function configureLogger({logsFolder, level = winston.level}) {
+  winston.level = level;
   logsFolder = logsFolder || currentLogsFolder;
 
   if (!path.isAbsolute(logsFolder)) {
@@ -50,15 +50,14 @@ export function configureLogger({logsFolder}) {
   currentLogsFolder = logsFolder;
 
   logger.configure({
-    transports:  generateTransports()
+    transports:  generateTransports(level)
   })
 }
 
 configureLogger({logsFolder: LOGS_FOLDER});
 
 export function addGroup(groupName) {
-  let level = process.env.VERBOSE ? 'verbose': 'info';
-
+  let level = winston.level;
   let transports =  generateTransports().concat(new (DailyRotateFile)({
     filename: groupName,
     dirname: currentLogsFolder,