From 0daa7110ca455828be8ddf8f6224c7b61547a06c Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 6 Jan 2019 17:47:16 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/base.js |  6 +++---
 server/index.js       | 12 ++++++------
 server/routes.js      |  5 ++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/config/base.js b/server/config/base.js
index b613675c..9e868664 100644
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -18,13 +18,13 @@ module.exports = {
 
     servers: [
         {
-            name: '1',
-            mode: 'normal', //none, normal, site, reader, omnireader
+            serverName: '1',
+            mode: 'normal',
             ip: '127.0.0.1',
             port: '33080',
         },
         {
-            name: '2',
+            serverName: '2',
             mode: 'omnireader',
             ip: '0.0.0.0',
             port: '33081',
diff --git a/server/index.js b/server/index.js
index 978a817d..3db9dab3 100644
--- a/server/index.js
+++ b/server/index.js
@@ -19,10 +19,10 @@ async function main() {
     for (let server of config.servers) {
         if (server.mode !== 'none') {
             const app = express();
-            app.serverConfig = server;
+            const serverConfig = Object.assign({}, config, server);
 
             let devModule = undefined;
-            if (config.branch == 'development') {
+            if (serverConfig.branch == 'development') {
                 const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
                 devModule = require(devFileName);
                 devModule.webpackDevMiddleware(app);
@@ -32,9 +32,9 @@ async function main() {
             app.use(express.json());
             if (devModule)
                 devModule.logQueries(app);
-            app.use(express.static(config.publicDir, { maxAge: '30d' }));
+            app.use(express.static(serverConfig.publicDir, { maxAge: '30d' }));
 
-            require('./routes').initRoutes(app, connPool, config);
+            require('./routes').initRoutes(app, connPool, serverConfig);
 
             if (devModule) {
                 devModule.logErrors(app);
@@ -45,8 +45,8 @@ async function main() {
                 });
             }
 
-            app.listen(server.port, server.ip, function() {
-                log(`Server-${server.name} is ready on ${server.ip}:${server.port}, mode: ${server.mode}`);
+            app.listen(serverConfig.port, serverConfig.ip, function() {
+                log(`Server-${serverConfig.serverName} is ready on ${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
             });
         }
     }
diff --git a/server/routes.js b/server/routes.js
index f47330b1..6897586b 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -4,9 +4,8 @@ function initRoutes(app, connPool, config) {
     const misc = new c.MiscController(connPool, config);
 
     //access
-    const serverMode = app.serverConfig.mode;
     const [all, normal, site, reader, omnireader] = // eslint-disable-line no-unused-vars
-        [serverMode, 'normal', 'site', 'reader', 'omnireader'];
+        [config.mode, 'normal', 'site', 'reader', 'omnireader'];
 
     //routes
     const routes = [
@@ -19,7 +18,7 @@ function initRoutes(app, connPool, config) {
         access = new Set(access);
 
         let callback = () => {};
-        if (access.has(serverMode)) {//allowed
+        if (access.has(config.mode)) {//allowed
             callback = async function(req, res) {
                 try {
                     const result = await controller(req, res, options);