Fabio/webssh2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update config.js to read config file synchronously and merge configuration

Browse source
This commit is contained in:
Bill Church 2024-08-17 16:19:19 +00:00
parent b4cbfb4b46
commit ad627e6596
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/config.js
View file

@ -271,13 +271,13 @@ function getConfigPath() {
} }
/** /**
* Reads the config file * Reads the config file synchronously
* @param {string} configPath - The path to the config file * @param {string} configPath - The path to the config file
* @returns {Config} The configuration object * @returns {Object} The configuration object
*/ */
function readConfigFile(configPath) { function readConfigFile(configPath) {
console.log("WebSSH2 service reading config from: " + configPath) console.log("WebSSH2 service reading config from: " + configPath)
return readConfig(configPath) return readConfig.sync(configPath)
} }
/** /**
@ -312,8 +312,8 @@ function logError(message, error) {
} }
/** /**
* Loads and merges the configuration * Loads and merges the configuration synchronously
* @returns {Config} The merged configuration * @returns {Object} The merged configuration
*/ */
function loadConfig() { function loadConfig() {
const configPath = getConfigPath() const configPath = getConfigPath()
@ -376,9 +376,10 @@ function deepMerge(target, source) {
} }
return target return target
} }
/** /**
* The loaded configuration * The loaded configuration
* @type {Config} * @type {Object}
*/ */
const config = loadConfig() const config = loadConfig()