deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Рефакторинг

Browse Source
This commit is contained in:
Book Pauk
2019-01-06 17:47:16 +07:00
parent ae50597ad4
commit 0daa7110ca
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/config/base.js
View File

@@ -18,13 +18,13 @@ module.exports = {
servers: [ servers: [
{ {
name: '1', serverName: '1',
mode: 'normal', //none, normal, site, reader, omnireader mode: 'normal',
ip: '127.0.0.1', ip: '127.0.0.1',
port: '33080', port: '33080',
}, },
{ {
name: '2', serverName: '2',
mode: 'omnireader', mode: 'omnireader',
ip: '0.0.0.0', ip: '0.0.0.0',
port: '33081', port: '33081',

12
server/index.js
View File

@@ -19,10 +19,10 @@ async function main() {
for (let server of config.servers) { for (let server of config.servers) {
if (server.mode !== 'none') { if (server.mode !== 'none') {
const app = express(); const app = express();
app.serverConfig = server; const serverConfig = Object.assign({}, config, server);
let devModule = undefined; let devModule = undefined;
if (config.branch == 'development') { if (serverConfig.branch == 'development') {
const devFileName = './dev.js'; //ignored by pkg -50Mb executable size const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
devModule = require(devFileName); devModule = require(devFileName);
devModule.webpackDevMiddleware(app); devModule.webpackDevMiddleware(app);
@@ -32,9 +32,9 @@ async function main() {
app.use(express.json()); app.use(express.json());
if (devModule) if (devModule)
devModule.logQueries(app); 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) { if (devModule) {
devModule.logErrors(app); devModule.logErrors(app);
@@ -45,8 +45,8 @@ async function main() {
}); });
} }
app.listen(server.port, server.ip, function() { app.listen(serverConfig.port, serverConfig.ip, function() {
log(`Server-${server.name} is ready on ${server.ip}:${server.port}, mode: ${server.mode}`); log(`Server-${serverConfig.serverName} is ready on ${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
}); });
} }
} }

5
server/routes.js
View File

@@ -4,9 +4,8 @@ function initRoutes(app, connPool, config) {
const misc = new c.MiscController(connPool, config); const misc = new c.MiscController(connPool, config);
//access //access
const serverMode = app.serverConfig.mode;
const [all, normal, site, reader, omnireader] = // eslint-disable-line no-unused-vars const [all, normal, site, reader, omnireader] = // eslint-disable-line no-unused-vars
[serverMode, 'normal', 'site', 'reader', 'omnireader']; [config.mode, 'normal', 'site', 'reader', 'omnireader'];
//routes //routes
const routes = [ const routes = [
@@ -19,7 +18,7 @@ function initRoutes(app, connPool, config) {
access = new Set(access); access = new Set(access);
let callback = () => {}; let callback = () => {};
if (access.has(serverMode)) {//allowed if (access.has(config.mode)) {//allowed
callback = async function(req, res) { callback = async function(req, res) {
try { try {
const result = await controller(req, res, options); const result = await controller(req, res, options);