thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mon config merge

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-07-15 16:25:22 +03:00
parent fc219b8602
commit 7a13f85ae2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mon/mon.js
+3 -2
View File
@@ -22,12 +22,13 @@ class Mon
{ {
static async run_forever(config) static async run_forever(config)
{ {
let mergedConfig = config;
if (fs.existsSync(config.config_path||'/etc/vitastor/vitastor.conf')) if (fs.existsSync(config.config_path||'/etc/vitastor/vitastor.conf'))
{ {
const fileConfig = JSON.parse(fs.readFileSync(config.config_path||'/etc/vitastor/vitastor.conf', { encoding: 'utf-8' })); const fileConfig = JSON.parse(fs.readFileSync(config.config_path||'/etc/vitastor/vitastor.conf', { encoding: 'utf-8' }));
config = { ...fileConfig, config }; mergedConfig = { ...fileConfig, ...config };
} }
let antietcd = await AntiEtcdAdapter.start_antietcd(config); let antietcd = await AntiEtcdAdapter.start_antietcd(mergedConfig);
let mon; let mon;
const run = () => const run = () =>
{ {