Fix parse-community#6179 Initializing default logger (parse-community…

…#6186) * Fix parse-community#6179 Initializing default logger Fixes: parse-community#6179 Removes unnessary logs * fix typo * if error just write to console
UnderratedDev · Nov 7, 2019 · f39a7fd · f39a7fd
1 parent b6b3e81
commit f39a7fd
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 46 deletions.
diff --git a/src/Adapters/Auth/twitter.js b/src/Adapters/Auth/twitter.js
@@ -1,7 +1,6 @@
 // Helper functions for accessing the twitter API.
 var OAuth = require('./OAuth1Client');
 var Parse = require('parse/node').Parse;
-var logger = require('../../logger').default;
 
 // Returns a promise that fulfills iff this user id is valid.
 function validateAuthData(authData, options) {
@@ -37,10 +36,6 @@ function handleMultipleConfigurations(authData, options) {
  if (Array.isArray(options)) {
  const consumer_key = authData.consumer_key;
  if (!consumer_key) {
- logger.error(
- 'Twitter Auth',
- 'Multiple twitter configurations are available, by no consumer_key was sent by the client.'
- );
  throw new Parse.Error(
  Parse.Error.OBJECT_NOT_FOUND,
  'Twitter auth is invalid for this user.'
@@ -51,10 +46,6 @@ function handleMultipleConfigurations(authData, options) {
  });
 
  if (options.length == 0) {
- logger.error(
- 'Twitter Auth',
- 'Cannot find a configuration for the provided consumer_key'
- );
  throw new Parse.Error(
  Parse.Error.OBJECT_NOT_FOUND,
  'Twitter auth is invalid for this user.'

diff --git a/src/Adapters/Auth/vkontakte.js b/src/Adapters/Auth/vkontakte.js
@@ -4,7 +4,6 @@
 
 const httpsRequest = require('./httpsRequest');
 var Parse = require('parse/node').Parse;
-var logger = require('../../logger').default;
 
 // Returns a promise that fulfills iff this user id is valid.
 function validateAuthData(authData, params) {
@@ -28,7 +27,6 @@ function validateAuthData(authData, params) {
  );
  });
  }
- logger.error('Vk Auth', 'Vk appIds or appSecret is incorrect.');
  throw new Parse.Error(
  Parse.Error.OBJECT_NOT_FOUND,
  'Vk appIds or appSecret is incorrect.'
@@ -45,10 +43,6 @@ function vkOAuth2Request(params) {
  !params.appSecret ||
  !params.appSecret.length
  ) {
- logger.error(
- 'Vk Auth',
- 'Vk auth is not configured. Missing appIds or appSecret.'
- );
  throw new Parse.Error(
  Parse.Error.OBJECT_NOT_FOUND,
  'Vk auth is not configured. Missing appIds or appSecret.'

diff --git a/src/Adapters/Logger/WinstonLogger.js b/src/Adapters/Logger/WinstonLogger.js
@@ -13,37 +13,45 @@ function configureTransports(options) {
  const silent = options.silent;
  delete options.silent;
 
- if (!_.isNil(options.dirname)) {
- const parseServer = new DailyRotateFile(
- Object.assign(
- {
- filename: 'parse-server.info',
- json: true,
- format: format.combine(format.timestamp(), format.splat(), format.json()),
- },
- options
- )
- );
- parseServer.name = 'parse-server';
- transports.push(parseServer);
-
- const parseServerError = new DailyRotateFile(
- Object.assign(
- {
- filename: 'parse-server.err',
- json: true,
- format: format.combine(
- format.timestamp(),
- format.splat(),
- format.json()
- ),
- },
- options,
- { level: 'error' }
- )
- );
- parseServerError.name = 'parse-server-error';
- transports.push(parseServerError);
+ try {
+ if (!_.isNil(options.dirname)) {
+ const parseServer = new DailyRotateFile(
+ Object.assign(
+ {
+ filename: 'parse-server.info',
+ json: true,
+ format: format.combine(
+ format.timestamp(),
+ format.splat(),
+ format.json()
+ ),
+ },
+ options
+ )
+ );
+ parseServer.name = 'parse-server';
+ transports.push(parseServer);
+
+ const parseServerError = new DailyRotateFile(
+ Object.assign(
+ {
+ filename: 'parse-server.err',
+ json: true,
+ format: format.combine(
+ format.timestamp(),
+ format.splat(),
+ format.json()
+ ),
+ },
+ options,
+ { level: 'error' }
+ )
+ );
+ parseServerError.name = 'parse-server-error';
+ transports.push(parseServerError);
+ }
+ } catch (e) {
+ /* */
  }
 
  const consoleFormat = options.json ? format.json() : format.simple();

diff --git a/src/logger.js b/src/logger.js
@@ -3,6 +3,7 @@ import defaults from './defaults';
 import { WinstonLoggerAdapter } from './Adapters/Logger/WinstonLoggerAdapter';
 import { LoggerController } from './Controllers/LoggerController';
 
+// Used for Separate Live Query Server
 function defaultLogger() {
  const options = {
  logsFolder: defaults.logsFolder,