Доработки devModule
This commit is contained in:
@@ -15,18 +15,28 @@ function webpackDevMiddleware(app) {
|
||||
app.use(hotMiddleware(compiler, {
|
||||
log: log
|
||||
}));
|
||||
}
|
||||
|
||||
function logQueries(app) {
|
||||
app.use(function(req, res, next) {
|
||||
const start = Date.now();
|
||||
const params = (req.body ? req.body.params : '');
|
||||
log(`${req.method} ${req.originalUrl} ${req.body.params}`);
|
||||
log(`${req.method} ${req.originalUrl} ${JSON.stringify(req.body)}`);
|
||||
res.once('finish', () => {
|
||||
log(`${Date.now() - start}ms`);
|
||||
});
|
||||
next();
|
||||
});
|
||||
}
|
||||
|
||||
function logErrors(app) {
|
||||
app.use(function(err, req, res, next) {
|
||||
log(LM_ERR, err.stack);
|
||||
res.status(500).send(err.stack);
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
webpackDevMiddleware
|
||||
webpackDevMiddleware,
|
||||
logQueries,
|
||||
logErrors
|
||||
};
|
||||
@@ -16,26 +16,29 @@ async function main() {
|
||||
log('Opening database');
|
||||
await connPool.init();
|
||||
|
||||
app.use(express.json());
|
||||
|
||||
let devModule = undefined;
|
||||
if (config.branch == 'development') {
|
||||
const devFileName = './dev.js'; //ignored by pkg
|
||||
require(devFileName).webpackDevMiddleware(app);
|
||||
const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
|
||||
devModule = require(devFileName);
|
||||
devModule.webpackDevMiddleware(app);
|
||||
}
|
||||
|
||||
app.use(compression({ level: 1 }));
|
||||
app.use(express.json());
|
||||
if (devModule)
|
||||
devModule.logQueries(app);
|
||||
app.use(express.static(config.publicDir, { maxAge: '30d' }));
|
||||
|
||||
require('./routes').initRoutes(app, connPool, config);
|
||||
|
||||
app.use(function(err, req, res, next) {
|
||||
log(LM_ERR, err.stack);
|
||||
if (config.branch == 'development') {
|
||||
res.status(500).send(err.stack);
|
||||
} else {
|
||||
if (devModule) {
|
||||
devModule.logErrors(app);
|
||||
} else {
|
||||
app.use(function(err, req, res, next) {
|
||||
log(LM_ERR, err.stack);
|
||||
res.sendStatus(500);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
app.listen(config.port, config.ip, function() {
|
||||
log('Server is ready');
|
||||
|
||||
Reference in New Issue
Block a user