Доработки devModule

This commit is contained in:
Book Pauk
2019-01-04 18:53:14 +07:00
parent f6d19445a2
commit b3b32034c5
2 changed files with 27 additions and 14 deletions

View File

@@ -15,11 +15,12 @@ function webpackDevMiddleware(app) {
app.use(hotMiddleware(compiler, { app.use(hotMiddleware(compiler, {
log: log log: log
})); }));
}
function logQueries(app) {
app.use(function(req, res, next) { app.use(function(req, res, next) {
const start = Date.now(); const start = Date.now();
const params = (req.body ? req.body.params : ''); log(`${req.method} ${req.originalUrl} ${JSON.stringify(req.body)}`);
log(`${req.method} ${req.originalUrl} ${req.body.params}`);
res.once('finish', () => { res.once('finish', () => {
log(`${Date.now() - start}ms`); log(`${Date.now() - start}ms`);
}); });
@@ -27,6 +28,15 @@ function webpackDevMiddleware(app) {
}); });
} }
function logErrors(app) {
app.use(function(err, req, res, next) {
log(LM_ERR, err.stack);
res.status(500).send(err.stack);
});
}
module.exports = { module.exports = {
webpackDevMiddleware webpackDevMiddleware,
logQueries,
logErrors
}; };

View File

@@ -16,26 +16,29 @@ async function main() {
log('Opening database'); log('Opening database');
await connPool.init(); await connPool.init();
app.use(express.json()); let devModule = undefined;
if (config.branch == 'development') { if (config.branch == 'development') {
const devFileName = './dev.js'; //ignored by pkg const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
require(devFileName).webpackDevMiddleware(app); devModule = require(devFileName);
devModule.webpackDevMiddleware(app);
} }
app.use(compression({ level: 1 })); app.use(compression({ level: 1 }));
app.use(express.json());
if (devModule)
devModule.logQueries(app);
app.use(express.static(config.publicDir, { maxAge: '30d' })); app.use(express.static(config.publicDir, { maxAge: '30d' }));
require('./routes').initRoutes(app, connPool, config); require('./routes').initRoutes(app, connPool, config);
if (devModule) {
devModule.logErrors(app);
} else {
app.use(function(err, req, res, next) { app.use(function(err, req, res, next) {
log(LM_ERR, err.stack); log(LM_ERR, err.stack);
if (config.branch == 'development') {
res.status(500).send(err.stack);
} else {
res.sendStatus(500); res.sendStatus(500);
}
}); });
}
app.listen(config.port, config.ip, function() { app.listen(config.port, config.ip, function() {
log('Server is ready'); log('Server is ready');