Merge pull request #1234 from ParsePlatform/flovilmart.winston

Better logging with winston
This commit is contained in:
Drew
2016-03-29 10:54:36 -07:00
15 changed files with 180 additions and 255 deletions

View File

@@ -11,6 +11,8 @@ var batch = require('./batch'),
Parse = require('parse/node').Parse,
authDataManager = require('./authDataManager');
import { logger,
configureLogger } from './logger';
import cache from './cache';
import Config from './Config';
import parseServerPackage from '../package.json';
@@ -84,6 +86,7 @@ class ParseServer {
filesAdapter,
push,
loggerAdapter,
logsFolder,
databaseURI = DatabaseAdapter.defaultDatabaseURI,
databaseOptions,
cloud,
@@ -114,6 +117,12 @@ class ParseServer {
Parse.initialize(appId, javascriptKey || 'unused', masterKey);
Parse.serverURL = serverURL;
if (logsFolder) {
configureLogger({
logsFolder
})
}
if (databaseAdapter) {
DatabaseAdapter.setAdapter(databaseAdapter);
}
@@ -251,7 +260,7 @@ class ParseServer {
if (!process.env.TESTING) {
process.on('uncaughtException', (err) => {
if ( err.code === "EADDRINUSE" ) { // user-friendly message for this common error
console.log(`Unable to listen on port ${err.port}. The port is already in use.`);
console.error(`Unable to listen on port ${err.port}. The port is already in use.`);
process.exit(0);
} else {
throw err;