merge with master

This commit is contained in:
MrFry 2020-03-15 12:56:20 +01:00
commit 18aba3c756
4 changed files with 61 additions and 8 deletions

View file

@ -25,7 +25,6 @@ const httpsport = 5001
const express = require('express')
const vhost = require('vhost')
const logger = require('./utils/logger.js')
logger.Load()
const utils = require('./utils/utils.js')
const http = require('http')
const https = require('https')
@ -39,6 +38,17 @@ const loggableKeywords = [
]
let modules = JSON.parse(utils.ReadFile(modulesFile))
let logLevel = parseInt(GetParams()[0])
if (isNaN(logLevel)) {
logLevel = 0
}
logger.Log('Loglevel is: ' + logLevel)
logger.Load(logLevel) // TODO: debug level in enviromet variable / param
function GetParams () {
return process.argv.splice(2)
}
try {
if (utils.FileExists(extraModulesFile)) {
const extraModules = JSON.parse(utils.ReadFile(extraModulesFile))