Преглед на файлове

Renamed to nodeEnv and cleaned up

tags/v0.11.0
kckckc преди 2 години
родител
ревизия
c33953a785
променени са 2 файла, в които са добавени 10 реда и са изтрити 17 реда
  1. +3
    -9
      src/server/config/serverConfig.js
  2. +7
    -8
      src/server/server/index.js

+ 3
- 9
src/server/config/serverConfig.js Целия файл

@@ -1,26 +1,20 @@
//eslint-disable-next-line no-process-env
const isProduction = process.env.NODE_ENV === 'production';
/* eslint-disable no-process-env */


module.exports = { module.exports = {
isProduction,
version: '0.10.6', version: '0.10.6',
port: 4000, port: 4000,
startupMessage: 'Server: ready', startupMessage: 'Server: ready',
defaultZone: 'fjolarok', defaultZone: 'fjolarok',


nodeEnv: process.env.NODE_ENV,

//Options: //Options:
// sqlite // sqlite
// rethink // rethink
//eslint-disable-next-line no-process-env
db: process.env.IWD_DB || 'sqlite', db: process.env.IWD_DB || 'sqlite',
//eslint-disable-next-line no-process-env
dbHost: process.env.IWD_DB_HOST || 'localhost', dbHost: process.env.IWD_DB_HOST || 'localhost',
//eslint-disable-next-line no-process-env
dbPort: process.env.IWD_DB_PORT || 28015, dbPort: process.env.IWD_DB_PORT || 28015,
//eslint-disable-next-line no-process-env
dbName: process.env.IWD_DB_NAME || 'live', dbName: process.env.IWD_DB_NAME || 'live',
//eslint-disable-next-line no-process-env
dbUser: process.env.IWD_DB_USER || 'admin', dbUser: process.env.IWD_DB_USER || 'admin',
//eslint-disable-next-line no-process-env
dbPass: process.env.IWD_DB_PASS || '' dbPass: process.env.IWD_DB_PASS || ''
}; };

+ 7
- 8
src/server/server/index.js Целия файл

@@ -13,9 +13,11 @@ const rest = require('../security/rest');
const { const {
port = 4000, port = 4000,
startupMessage = 'Server: Ready', startupMessage = 'Server: Ready',
isProduction
nodeEnv
} = require('../config/serverConfig'); } = require('../config/serverConfig');


const compileLessOnce = nodeEnv === 'production';

const onConnection = require('./onConnection'); const onConnection = require('./onConnection');
const { appRoot, appFile } = require('./requestHandlers'); const { appRoot, appFile } = require('./requestHandlers');


@@ -44,13 +46,10 @@ const init = async () => {
next(); next();
}); });


app.use(lessMiddleware('../',
isProduction ? {
once: true
} : {
force: true
}
));
app.use(lessMiddleware('../', {
once: compileLessOnce,
force: !compileLessOnce
}));


rest.init(app); rest.init(app);




Зареждане…
Отказ
Запис