Browse Source

Renamed to nodeEnv and cleaned up

tags/v0.11.0
kckckc 2 years ago
parent
commit
c33953a785
2 changed files with 10 additions and 17 deletions
  1. +3
    -9
      src/server/config/serverConfig.js
  2. +7
    -8
      src/server/server/index.js

+ 3
- 9
src/server/config/serverConfig.js View File

@@ -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 = {
isProduction,
version: '0.10.6',
port: 4000,
startupMessage: 'Server: ready',
defaultZone: 'fjolarok',

nodeEnv: process.env.NODE_ENV,

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

+ 7
- 8
src/server/server/index.js View File

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

const compileLessOnce = nodeEnv === 'production';

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

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

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

rest.init(app);



Loading…
Cancel
Save