Revert "Log objects rather than JSON stringified objects" (#1995)

This commit is contained in:
Drew
2016-06-08 10:11:08 -07:00
parent db76aa376f
commit fcd914bdfd
4 changed files with 12 additions and 27 deletions

View File

@@ -154,20 +154,15 @@ export default class PromiseRouter {
// just treat it like it resolved to an error.
function makeExpressHandler(promiseHandler) {
return function(req, res, next) {
var url = maskSensitiveUrl(req);
try {
log.verbose(`REQUEST for [${req.method}] ${url}`, {
method: req.method,
url: url,
headers: req.headers,
body: maskSensitiveBody(req)
});
log.verbose(req.method, maskSensitiveUrl(req), req.headers,
JSON.stringify(maskSensitiveBody(req), null, 2));
promiseHandler(req).then((result) => {
if (!result.response && !result.location && !result.text) {
log.error('the handler did not include a "response" or a "location" field');
throw 'control should not get here';
}
log.verbose(`RESPONSE from [${req.method}] ${url}`, {result: result});
log.verbose(JSON.stringify(result, null, 2));
var status = result.status || 200;
res.status(status);
@@ -191,11 +186,11 @@ function makeExpressHandler(promiseHandler) {
}
res.json(result.response);
}, (e) => {
log.error(`Error generating response. ${e}`, {error: e});
log.verbose('error:', e);
next(e);
});
} catch (e) {
log.error(`Error handling request: ${e}`, {error: e});
log.verbose('exception:', e);
next(e);
}
}

View File

@@ -1,5 +1,5 @@
import winston from 'winston';
import ParseServer from './ParseServer';
import logger from './logger';
import S3Adapter from 'parse-server-s3-adapter'
import FileSystemAdapter from 'parse-server-fs-adapter'
import TestUtils from './TestUtils';
@@ -16,4 +16,4 @@ _ParseServer.createLiveQueryServer = ParseServer.createLiveQueryServer;
let GCSAdapter = useExternal('GCSAdapter', 'parse-server-gcs-adapter');
export default ParseServer;
export { S3Adapter, GCSAdapter, FileSystemAdapter, TestUtils, _ParseServer as ParseServer, logger };
export { S3Adapter, GCSAdapter, FileSystemAdapter, TestUtils, _ParseServer as ParseServer };