remove morgan
morgan breaks our log output parsing. debug() puts a timestamp in the front.
This commit is contained in:
+8
-19
@@ -12,6 +12,7 @@ const assert = require('assert'),
|
||||
eventlog = require('./eventlog.js'),
|
||||
express = require('express'),
|
||||
http = require('http'),
|
||||
HttpError = require('connect-lastmile').HttpError,
|
||||
middleware = require('./middleware'),
|
||||
platform = require('./platform.js'),
|
||||
routes = require('./routes/index.js'),
|
||||
@@ -22,6 +23,12 @@ const assert = require('assert'),
|
||||
|
||||
let gHttpServer = null;
|
||||
|
||||
function notFoundHandler(req, res, next) {
|
||||
const cleanUrl = req.url.replace(/(access_token=)[^&]+/, '$1' + '<redacted>');
|
||||
debug(`no such route: ${req.method} ${cleanUrl}`);
|
||||
return next(new HttpError(404, 'No such route'));
|
||||
}
|
||||
|
||||
async function initializeExpressSync() {
|
||||
const app = express();
|
||||
// disable slowloris prevention: https://github.com/nodejs/node/issues/47421
|
||||
@@ -42,25 +49,6 @@ async function initializeExpressSync() {
|
||||
// for rate limiting
|
||||
app.enable('trust proxy');
|
||||
|
||||
if (process.env.BOX_ENV !== 'test') {
|
||||
app.use(middleware.morgan(function (tokens, req, res) {
|
||||
return [
|
||||
'Box',
|
||||
tokens.method(req, res),
|
||||
tokens.url(req, res).replace(/(access_token=)[^&]+/, '$1' + '<redacted>'),
|
||||
tokens.status(req, res),
|
||||
res.errorBody ? res.errorBody.status : '', // attached by connect-lastmile. can be missing when router errors like 404
|
||||
res.errorBody ? res.errorBody.message : '', // attached by connect-lastmile. can be missing when router errors like 404
|
||||
tokens['response-time'](req, res), 'ms', '-',
|
||||
tokens.res(req, res, 'content-length')
|
||||
].join(' ');
|
||||
}, {
|
||||
immediate: false,
|
||||
// only log failed requests by default
|
||||
skip: function (req, res) { return res.statusCode < 400; }
|
||||
}));
|
||||
}
|
||||
|
||||
const router = new express.Router();
|
||||
router.del = router.delete; // amend router.del for readability further on
|
||||
|
||||
@@ -71,6 +59,7 @@ async function initializeExpressSync() {
|
||||
.use(urlencoded)
|
||||
.use(middleware.cors({ origins: [ '*' ], allowCredentials: false }))
|
||||
.use(router)
|
||||
.use(notFoundHandler)
|
||||
.use(middleware.lastMile());
|
||||
|
||||
// NOTE: routes that use multi-part have to be whitelisted in the reverse proxy
|
||||
|
||||
Reference in New Issue
Block a user