Expose controller instead of adapter, reduces method requirements for adapter

Author: flovilmart

spec/WinstonLoggerAdapter.spec.js

@@ -8,7 +8,7 @@ describe('info logs', () => {
 
   it("Verify INFO logs", (done) => {
       var winstonLoggerAdapter = new WinstonLoggerAdapter();
-      winstonLoggerAdapter.info('testing info logs', () => {
+      winstonLoggerAdapter.log('info', 'testing info logs', () => {
         winstonLoggerAdapter.query({
           from: new Date(Date.now() - 500),
           size: 100,
@@ -29,7 +29,7 @@ describe('info logs', () => {
 describe('error logs', () => {
   it("Verify ERROR logs", (done) => {
     var winstonLoggerAdapter = new WinstonLoggerAdapter();
-    winstonLoggerAdapter.error('testing error logs', () => {
+    winstonLoggerAdapter.log('error', 'testing error logs', () => {
       winstonLoggerAdapter.query({
         from: new Date(Date.now() - 500),
         size: 100,

src/Adapters/Logger/LoggerAdapter.js

@@ -4,25 +4,12 @@
 //
 // Adapter classes must implement the following functions:
 // * log() {}
-// * error() {}
-// * warn() {}
-// * info() {}
-// * verbose() {}
-// * debug() {}
-// * silly() {}
 // * query(options, callback) /* optional */
-// * configureLogger(options)
 // Default is WinstonLoggerAdapter.js
 
 export class LoggerAdapter {
   constructor(options) {}
-  log() {}
-  error() {}
-  warn() {}
-  info() {}
-  verbose() {}
-  debug() {}
-  silly() {}
+  log(level, message, /* meta */) {}
 }
 
 export default LoggerAdapter;

src/Adapters/Logger/WinstonLoggerAdapter.js

@@ -15,33 +15,9 @@ export class WinstonLoggerAdapter extends LoggerAdapter {
       configureLogger(options);
     }
   }
-  
-  error() {
-    return logger.error.apply(undefined, arguments);
-  }
-
-  warn() {
-    return logger.warn.apply(undefined, arguments);
-  }
-
-  info() {
-    return logger.info.apply(undefined, arguments);
-  }
-
-  verbose() {
-    return logger.verbose.apply(undefined, arguments);
-  }
-
-  debug() {
-    return logger.debug.apply(undefined, arguments);
-  }
-
-  silly() {
-    return logger.silly.apply(undefined, arguments);
-  }
 
   log() {
-    return logger.log.apply(undefined, arguments);
+    return logger.log.apply(logger, arguments);
   }
 
   addTransport(transport) {

src/Controllers/LoggerController.js

@@ -16,7 +16,35 @@ export const LogOrder = {
 }
 
 export class LoggerController extends AdaptableController {
+  
+  log(level, args) {
+    args = [].concat(level, [...args]);
+    this.adapter.log.apply(this.adapter, args);
+  }
+
+  info() {
+    return this.log('info', arguments);
+  }
+  
+  error() {
+    return this.log('error', arguments);
+  }
+
+  warn() {
+    return this.log('warn', arguments);
+  }
 
+  verbose() {
+    return this.log('verbose', arguments);
+  }
+
+  debug() {
+    return this.log('debug', arguments);
+  }
+
+  silly() {
+    return this.log('silly', arguments);
+  }
   // check that date input is valid
   static validDateTime(date) {
     if (!date) {

src/ParseServer.js

@@ -181,9 +181,6 @@ class ParseServer {
     const pushControllerAdapter = loadAdapter(push && push.adapter, ParsePushAdapter, push || {});
 
     const loggerControllerAdapter = loadAdapter(loggerAdapter, WinstonLoggerAdapter, { jsonLogs, logsFolder, verbose, logLevel, silent });
-
-    logging.setLogger(loggerControllerAdapter);
-
     const emailControllerAdapter = loadAdapter(emailAdapter);
     const cacheControllerAdapter = loadAdapter(cacheAdapter, InMemoryCacheAdapter, {appId: appId});
     const analyticsControllerAdapter = loadAdapter(analyticsAdapter, AnalyticsAdapter);
@@ -200,6 +197,8 @@ class ParseServer {
     const hooksController = new HooksController(appId, databaseController, webhookKey);
     const analyticsController = new AnalyticsController(analyticsControllerAdapter);
 
+    logging.setLogger(loggerController);
+
     // TODO: create indexes on first creation of a _User object. Otherwise it's impossible to
     // have a Parse app without it having a _User collection.
     let userClassPromise = databaseController.loadSchema()
@@ -208,14 +207,14 @@ class ParseServer {
     let usernameUniqueness = userClassPromise
     .then(() => databaseController.adapter.ensureUniqueness('_User', requiredUserFields, ['username']))
     .catch(error => {
-      loggerControllerAdapter.warn('Unable to ensure uniqueness for usernames: ', error);
+      loggerController.warn('Unable to ensure uniqueness for usernames: ', error);
       return Promise.reject(error);
     });
 
     let emailUniqueness = userClassPromise
     .then(() => databaseController.adapter.ensureUniqueness('_User', requiredUserFields, ['email']))
     .catch(error => {
-      loggerControllerAdapter.warn('Unable to ensure uniqueness for user email addresses: ', error);
+      loggerController.warn('Unable to ensure uniqueness for user email addresses: ', error);
       return Promise.reject(error);
     })
 

src/Routers/FunctionsRouter.js

@@ -65,7 +65,7 @@ export class FunctionsRouter extends PromiseRouter {
         master: req.auth && req.auth.isMaster,
         user: req.auth && req.auth.user,
         installationId: req.info.installationId,
-        log: req.config.loggerController && req.config.loggerController.adapter,
+        log: req.config.loggerController,
         headers: req.headers
       };
 

src/triggers.js

@@ -102,7 +102,7 @@ export function getRequestObject(triggerType, auth, parseObject, originalParseOb
     triggerName: triggerType,
     object: parseObject,
     master: false,
-    log: config.loggerController && config.loggerController.adapter
+    log: config.loggerController
   };
 
   if (originalParseObject) {