* Fix #6179 Initializing default logger Fixes: #6179 Removes unnessary logs * fix typo * if error just write to console
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
// Helper functions for accessing the twitter API.
|
// Helper functions for accessing the twitter API.
|
||||||
var OAuth = require('./OAuth1Client');
|
var OAuth = require('./OAuth1Client');
|
||||||
var Parse = require('parse/node').Parse;
|
var Parse = require('parse/node').Parse;
|
||||||
var logger = require('../../logger').default;
|
|
||||||
|
|
||||||
// Returns a promise that fulfills iff this user id is valid.
|
// Returns a promise that fulfills iff this user id is valid.
|
||||||
function validateAuthData(authData, options) {
|
function validateAuthData(authData, options) {
|
||||||
@@ -37,10 +36,6 @@ function handleMultipleConfigurations(authData, options) {
|
|||||||
if (Array.isArray(options)) {
|
if (Array.isArray(options)) {
|
||||||
const consumer_key = authData.consumer_key;
|
const consumer_key = authData.consumer_key;
|
||||||
if (!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(
|
throw new Parse.Error(
|
||||||
Parse.Error.OBJECT_NOT_FOUND,
|
Parse.Error.OBJECT_NOT_FOUND,
|
||||||
'Twitter auth is invalid for this user.'
|
'Twitter auth is invalid for this user.'
|
||||||
@@ -51,10 +46,6 @@ function handleMultipleConfigurations(authData, options) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (options.length == 0) {
|
if (options.length == 0) {
|
||||||
logger.error(
|
|
||||||
'Twitter Auth',
|
|
||||||
'Cannot find a configuration for the provided consumer_key'
|
|
||||||
);
|
|
||||||
throw new Parse.Error(
|
throw new Parse.Error(
|
||||||
Parse.Error.OBJECT_NOT_FOUND,
|
Parse.Error.OBJECT_NOT_FOUND,
|
||||||
'Twitter auth is invalid for this user.'
|
'Twitter auth is invalid for this user.'
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
const httpsRequest = require('./httpsRequest');
|
const httpsRequest = require('./httpsRequest');
|
||||||
var Parse = require('parse/node').Parse;
|
var Parse = require('parse/node').Parse;
|
||||||
var logger = require('../../logger').default;
|
|
||||||
|
|
||||||
// Returns a promise that fulfills iff this user id is valid.
|
// Returns a promise that fulfills iff this user id is valid.
|
||||||
function validateAuthData(authData, params) {
|
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(
|
throw new Parse.Error(
|
||||||
Parse.Error.OBJECT_NOT_FOUND,
|
Parse.Error.OBJECT_NOT_FOUND,
|
||||||
'Vk appIds or appSecret is incorrect.'
|
'Vk appIds or appSecret is incorrect.'
|
||||||
@@ -45,10 +43,6 @@ function vkOAuth2Request(params) {
|
|||||||
!params.appSecret ||
|
!params.appSecret ||
|
||||||
!params.appSecret.length
|
!params.appSecret.length
|
||||||
) {
|
) {
|
||||||
logger.error(
|
|
||||||
'Vk Auth',
|
|
||||||
'Vk auth is not configured. Missing appIds or appSecret.'
|
|
||||||
);
|
|
||||||
throw new Parse.Error(
|
throw new Parse.Error(
|
||||||
Parse.Error.OBJECT_NOT_FOUND,
|
Parse.Error.OBJECT_NOT_FOUND,
|
||||||
'Vk auth is not configured. Missing appIds or appSecret.'
|
'Vk auth is not configured. Missing appIds or appSecret.'
|
||||||
|
|||||||
@@ -13,37 +13,45 @@ function configureTransports(options) {
|
|||||||
const silent = options.silent;
|
const silent = options.silent;
|
||||||
delete options.silent;
|
delete options.silent;
|
||||||
|
|
||||||
if (!_.isNil(options.dirname)) {
|
try {
|
||||||
const parseServer = new DailyRotateFile(
|
if (!_.isNil(options.dirname)) {
|
||||||
Object.assign(
|
const parseServer = new DailyRotateFile(
|
||||||
{
|
Object.assign(
|
||||||
filename: 'parse-server.info',
|
{
|
||||||
json: true,
|
filename: 'parse-server.info',
|
||||||
format: format.combine(format.timestamp(), format.splat(), format.json()),
|
json: true,
|
||||||
},
|
format: format.combine(
|
||||||
options
|
format.timestamp(),
|
||||||
)
|
format.splat(),
|
||||||
);
|
format.json()
|
||||||
parseServer.name = 'parse-server';
|
),
|
||||||
transports.push(parseServer);
|
},
|
||||||
|
options
|
||||||
|
)
|
||||||
|
);
|
||||||
|
parseServer.name = 'parse-server';
|
||||||
|
transports.push(parseServer);
|
||||||
|
|
||||||
const parseServerError = new DailyRotateFile(
|
const parseServerError = new DailyRotateFile(
|
||||||
Object.assign(
|
Object.assign(
|
||||||
{
|
{
|
||||||
filename: 'parse-server.err',
|
filename: 'parse-server.err',
|
||||||
json: true,
|
json: true,
|
||||||
format: format.combine(
|
format: format.combine(
|
||||||
format.timestamp(),
|
format.timestamp(),
|
||||||
format.splat(),
|
format.splat(),
|
||||||
format.json()
|
format.json()
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
options,
|
options,
|
||||||
{ level: 'error' }
|
{ level: 'error' }
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
parseServerError.name = 'parse-server-error';
|
parseServerError.name = 'parse-server-error';
|
||||||
transports.push(parseServerError);
|
transports.push(parseServerError);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
/* */
|
||||||
}
|
}
|
||||||
|
|
||||||
const consoleFormat = options.json ? format.json() : format.simple();
|
const consoleFormat = options.json ? format.json() : format.simple();
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import defaults from './defaults';
|
|||||||
import { WinstonLoggerAdapter } from './Adapters/Logger/WinstonLoggerAdapter';
|
import { WinstonLoggerAdapter } from './Adapters/Logger/WinstonLoggerAdapter';
|
||||||
import { LoggerController } from './Controllers/LoggerController';
|
import { LoggerController } from './Controllers/LoggerController';
|
||||||
|
|
||||||
|
// Used for Separate Live Query Server
|
||||||
function defaultLogger() {
|
function defaultLogger() {
|
||||||
const options = {
|
const options = {
|
||||||
logsFolder: defaults.logsFolder,
|
logsFolder: defaults.logsFolder,
|
||||||
|
|||||||
Reference in New Issue
Block a user