Use logger instead of getLogger

- Removes PLog module

Author: flovilmart

spec/Subscription.spec.js

@@ -1,13 +1,13 @@
 var Subscription = require('../src/LiveQuery/Subscription').Subscription;
+let logger;
 describe('Subscription', function() {
 
   beforeEach(function() {
-    var mockError = jasmine.createSpy('error');
-    //spyOn(PLog, 'error').and.callThrough();
-    jasmine.mockLibrary('../src/LiveQuery/PLog', 'error', mockError);
+    logger = require('../src/logging').logger;
+    spyOn(logger, 'error').and.callThrough();
   });
 
-  xit('can be initialized', function() {
+  it('can be initialized', function() {
     var subscription = new Subscription('className', { key : 'value' }, 'hash');
 
     expect(subscription.className).toBe('className');
@@ -62,17 +62,15 @@ describe('Subscription', function() {
     var subscription = new Subscription('className', { key : 'value' }, 'hash');
     subscription.deleteClientSubscription(1, 1);
 
-    var PLog =require('../src/LiveQuery/PLog');
-    expect(PLog.error).toHaveBeenCalled();
+    expect(logger.error).toHaveBeenCalled();
   });
 
   it('can delete nonexistent request for one client', function() {
     var subscription = new Subscription('className', { key : 'value' }, 'hash');
     subscription.addClientSubscription(1, 1);
     subscription.deleteClientSubscription(1, 2);
 
-    var PLog =require('../src/LiveQuery/PLog');
-    expect(PLog.error).toHaveBeenCalled();
+    expect(logger.error).toHaveBeenCalled();
     expect(subscription.clientRequestIds.size).toBe(1);
     expect(subscription.clientRequestIds.get(1)).toEqual([1]);
   });
@@ -83,8 +81,7 @@ describe('Subscription', function() {
     subscription.addClientSubscription(1, 2);
     subscription.deleteClientSubscription(1, 2);
 
-    var PLog =require('../src/LiveQuery/PLog');
-    expect(PLog.error).not.toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalled();
     expect(subscription.clientRequestIds.size).toBe(1);
     expect(subscription.clientRequestIds.get(1)).toEqual([1]);
   });
@@ -96,8 +93,7 @@ describe('Subscription', function() {
     subscription.deleteClientSubscription(1, 1);
     subscription.deleteClientSubscription(1, 2);
 
-    var PLog =require('../src/LiveQuery/PLog');
-    expect(PLog.error).not.toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalled();
     expect(subscription.clientRequestIds.size).toBe(0);
   });
 
@@ -111,13 +107,8 @@ describe('Subscription', function() {
     subscription.deleteClientSubscription(2, 1);
     subscription.deleteClientSubscription(2, 2);
 
-    var PLog =require('../src/LiveQuery/PLog');
-    expect(PLog.error).not.toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalled();
     expect(subscription.clientRequestIds.size).toBe(1);
     expect(subscription.clientRequestIds.get(1)).toEqual([1]);
   });
-
-  afterEach(function(){
-    jasmine.restoreLibrary('../src/LiveQuery/PLog', 'error');
-  });
 });

src/Adapters/Logger/WinstonLogger.js

@@ -36,7 +36,7 @@ function updateTransports(options) {
         }, options));
     }
   }
-  // Mount the additiona transports
+  // Mount the additional transports
   additionalTransports.forEach((transport) => {
     transports[transport.name] = transport;
   });
@@ -45,7 +45,16 @@ function updateTransports(options) {
   });
 }
 
-export function configureLogger({ logsFolder, jsonLogs, logLevel = winston.level } = defaults) {
+export function configureLogger({
+  logsFolder = defaults.logsFolder,
+  jsonLogs = defaults.jsonLogs,
+  logLevel = winston.level,
+  verbose = defaults.verbose } = {}) {
+
+  if (verbose) {
+    logLevel = 'verbose';
+  }
+
   winston.level = logLevel;
   const options = {};
 

src/Adapters/Logger/WinstonLoggerAdapter.js

@@ -11,7 +11,9 @@ let _getNearestDay = (date) => {
 export class WinstonLoggerAdapter extends LoggerAdapter {
   constructor(options) {
     super();
-    configureLogger(options);
+    if (options) {
+      configureLogger(options);
+    }
   }
 
   info() {

src/Adapters/Storage/Mongo/MongoTransform.js

@@ -1,4 +1,4 @@
-import getLogger from '../../../logging';
+import logger from '../../../logging';
 import _   from 'lodash';
 var mongodb = require('mongodb');
 var Parse = require('parse/node').Parse;
@@ -749,11 +749,11 @@ const mongoObjectToParseObject = (className, mongoObject, schema) => {
         if (key.indexOf('_p_') == 0) {
           var newKey = key.substring(3);
           if (!schema.fields[newKey]) {
-            getLogger().info('transform.js', 'Found a pointer column not in the schema, dropping it.', className, newKey);
+            logger.info('transform.js', 'Found a pointer column not in the schema, dropping it.', className, newKey);
             break;
           }
           if (schema.fields[newKey].type !== 'Pointer') {
-            getLogger().info('transform.js', 'Found a pointer in a non-pointer column, dropping it.', className, key);
+            logger.info('transform.js', 'Found a pointer in a non-pointer column, dropping it.', className, key);
             break;
           }
           if (mongoObject[key] === null) {

src/Controllers/HooksController.js

@@ -4,7 +4,7 @@ import * as DatabaseAdapter from "../DatabaseAdapter";
 import * as triggers        from "../triggers";
 import * as Parse           from "parse/node";
 import * as request         from "request";
-import getLogger            from '../logging';
+import logger            from '../logging';
 
 const DefaultHooksCollectionName = "_Hooks";
 
@@ -181,7 +181,7 @@ function wrapToHTTPRequest(hook, key) {
     if (key) {
       jsonRequest.headers['X-Parse-Webhook-Key'] = key;
     } else {
-      getLogger().warn('Making outgoing webhook request without webhookKey being set!');
+      logger.warn('Making outgoing webhook request without webhookKey being set!');
     }
 
     request.post(hook.url, jsonRequest, function (err, httpResponse, body) {

src/LiveQuery/Client.js

@@ -1,5 +1,5 @@
 import Parse from 'parse/node';
-import getLogger from '../logging';
+import logger from '../logging';
 
 import type { FlattenedObjectData } from './Subscription';
 export type Message = { [attr: string]: any };
@@ -37,7 +37,7 @@ class Client {
   }
 
   static pushResponse(parseWebSocket: any, message: Message): void {
-    getLogger().verbose('Push Response : %j', message);
+    logger.verbose('Push Response : %j', message);
     parseWebSocket.send(message);
   }
 

src/LiveQuery/PLog.js

@@ -1,5 +1,5 @@
 import { ParsePubSub } from './ParsePubSub';
-import getLogger from '../logging';
+import logger from '../logging';
 
 class ParseCloudCodePublisher {
   parsePublisher: Object;
@@ -20,7 +20,7 @@ class ParseCloudCodePublisher {
 
   // Request is the request object from cloud code functions. request.object is a ParseObject.
   _onCloudCodeMessage(type: string, request: any): void {
-    getLogger().verbose('Raw request from cloud code current : %j | original : %j', request.object, request.original);
+    logger.verbose('Raw request from cloud code current : %j | original : %j', request.object, request.original);
     // We need the full JSON which includes className
     let message = {
       currentParseObject: request.object._toFullJSON()