Skip to content

Commit 012c202

Browse files
committed
added check for config
1 parent beaa51a commit 012c202

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

‎config.server.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1-
require('dotenv').config();
1+
const { exitOnError } = require('./server/lib/logger');
2+
var logger = require('./server/lib/logger');
3+
4+
require('dotenv').config()
25

36
var config = {};
7+
var errored = false;
8+
9+
config.WEB_PORT = process.env.WEB_PORT;
10+
config.SERVER_IP = process.env.SERVER_IP;
11+
config.SERVER_KEY = process.env.SERVER_KEY;
12+
13+
// put required parameters befor this check to ensure they are checked
14+
for (const [k,v] of Object.entries(config)){
15+
if (v == "" || typeof v == 'undefined'){
16+
logger.error(k+" missing! Please check configuration!");
17+
errored = true;
18+
}
19+
}
420

5-
if(process.env.WEB_PORT) config.WEB_PORT = process.env.WEB_PORT;
6-
if(process.env.SERVER_IP) config.SERVER_IP = process.env.SERVER_IP;
7-
if(process.env.SERVER_KEY) config.SERVER_KEY = process.env.SERVER_KEY;
21+
if (errored) process.exit();
822

923
config.VERSION = process.env.npm_package_version;
1024

‎package-lock.json‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "oasis",
3-
"version": "1.22.2",
3+
"version": "1.22.3",
44
"description": "Live Map for Farming Simulator 22",
55
"main": "server/app.js",
66
"private": false,
@@ -21,7 +21,6 @@
2121
"dependencies": {
2222
"async": "^3.2.0",
2323
"cookie-parser": "~1.4.4",
24-
"debug": "~2.6.9",
2524
"dotenv": "^10.0.0",
2625
"express": "~4.16.1",
2726
"http-errors": "~1.6.3",

0 commit comments

Comments
 (0)