kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-26 22:13:53 +01:00
Code Issues Activity

config save fix

Browse Source
This commit is contained in:
Marek Farkaš
2025-01-11 21:18:43 +01:00
parent 088b41ef4a
commit 687fd642a1
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/server_config.js
View File

@@ -100,7 +100,6 @@ let serverConfig = {
autoShutdown: false, autoShutdown: false,
enableDefaultFreq: false, enableDefaultFreq: false,
defaultFreq: "87.5", defaultFreq: "87.5",
testThing: "yes it works"
}; };
function deepMerge(target, source) { function deepMerge(target, source) {
@@ -118,23 +117,21 @@ function deepMerge(target, source) {
function configUpdate(newConfig) { function configUpdate(newConfig) {
if (newConfig.webserver && (newConfig.webserver.banlist !== undefined || newConfig.plugins !== undefined)) { if (newConfig.webserver && (newConfig.webserver.banlist !== undefined || newConfig.plugins !== undefined)) {
// If new banlist is provided, replace the existing one
serverConfig.webserver.banlist = newConfig.webserver.banlist; serverConfig.webserver.banlist = newConfig.webserver.banlist;
serverConfig.plugins = newConfig.plugins; serverConfig.plugins = newConfig.plugins;
delete newConfig.webserver.banlist; // Remove banlist from newConfig to avoid merging delete newConfig.webserver.banlist;
} }
deepMerge(serverConfig, newConfig); deepMerge(serverConfig, newConfig);
} }
function configSave() { function configSave() {
fs.writeFile(configPath, JSON.stringify(serverConfig, null, 2), (err) => { try {
if (err) { fs.writeFileSync(configPath, JSON.stringify(serverConfig, null, 2));
logError(err); logInfo('Server config saved successfully.');
} else { } catch (err) {
logInfo('Server config saved successfully.'); logError(err);
} }
});
} }
function configExists() { function configExists() {
@@ -145,7 +142,7 @@ if (configExists()) {
const configFileContents = fs.readFileSync(configPath, 'utf8'); const configFileContents = fs.readFileSync(configPath, 'utf8');
try { try {
const configFile = JSON.parse(configFileContents); const configFile = JSON.parse(configFileContents);
deepMerge(configFile, serverConfig); deepMerge(configFile, serverConfig);
serverConfig = configFile; serverConfig = configFile;
configSave(); configSave();
} catch (err) { } catch (err) {