Mascali/piston
1
0
Fork 0
mirror of https://github.com/engineer-man/piston.git synced 2025-05-01 17:36:28 +02:00
Code Issues Projects Releases Wiki Activity

validate json instead of a json header, and lots of cleanup

Browse source
This commit is contained in:
Brian Seymour 2021-05-07 14:22:25 -05:00
parent 0da1cd5867
commit de449c6d56
15 changed files with 272 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

26
api/src/config.js
View file

@ -2,7 +2,6 @@ const fss = require('fs');
const Logger = require('logplease');
const logger = Logger.create('config');
const options = [
{
key: 'log_level',
@ -31,7 +30,7 @@ const options = [
default: 1001,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -40,7 +39,7 @@ const options = [
default: 1500,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -49,7 +48,7 @@ const options = [
default: 1001,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -58,7 +57,7 @@ const options = [
default: 1500,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -76,7 +75,7 @@ const options = [
default: 1024,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -85,7 +84,7 @@ const options = [
default: 64,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -94,7 +93,7 @@ const options = [
default: 2048,
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -103,7 +102,7 @@ const options = [
default: 1000000, //1MB
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -112,7 +111,7 @@ const options = [
default: -1, // no limit
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -121,7 +120,7 @@ const options = [
default: -1, // no limit
parser: parse_int,
validators: [
(x,raw) => !isNaN(x) || `${raw} is not a number`,
(x, raw) => !is_nan(x) || `${raw} is not a number`,
]
},
{
@ -141,16 +140,14 @@ let config = {};
options.forEach(option => {
const env_key = "PISTON_" + option.key.to_upper_case();
const parser = option.parser || (x=>x);
const parser = option.parser || (x => x);
const env_val = process.env[env_key];
const parsed_val = parser(env_val);
const value = env_val || option.default;
option.validators.for_each(validator => {
let response = null;
if(env_val)
@ -174,5 +171,4 @@ if (errored) {
logger.info('Configuration successfully loaded');
module.exports = config;