From 4379a9fa9f803c2014c26e872c39ffee161bdc7e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 4 Jan 2019 16:28:44 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=B2=20=D0=B4=D0=B5=D0=B2-=D1=80=D0=B5=D0=B6=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/dev.js   | 10 ++++++++++
 server/index.js | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/server/dev.js b/server/dev.js
index 90dd8a2b..d4a0b919 100644
--- a/server/dev.js
+++ b/server/dev.js
@@ -15,6 +15,16 @@ function webpackDevMiddleware(app) {
     app.use(hotMiddleware(compiler, {
         log: log
     }));
+
+    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}`);
+        res.once('finish', () => {
+            log(`${Date.now() - start}ms`);
+        });
+        next();
+    });    
 }
 
 module.exports = {
diff --git a/server/index.js b/server/index.js
index 58f41c08..c83f5104 100644
--- a/server/index.js
+++ b/server/index.js
@@ -16,17 +16,27 @@ async function main() {
     log('Opening database');
     await connPool.init();
 
+    app.use(express.json());
+
     if (config.branch == 'development') {
         const devFileName = './dev.js'; //ignored by pkg
         require(devFileName).webpackDevMiddleware(app);
     }
 
     app.use(compression({ level: 1 }));
-    app.use(express.static(config.publicDir, { maxAge: '1d' }));
-    app.use(express.json());
+    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 {
+            res.sendStatus(500);
+        }
+    });
+
     app.listen(config.port, config.ip, function() {
         log('Server is ready');
     });