From 7a13f85ae25899f33b770ab89cd667005957828a Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 15 Jul 2024 16:25:22 +0300 Subject: [PATCH] Fix mon config merge --- mon/mon.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mon/mon.js b/mon/mon.js index 31355d35..a2702769 100644 --- a/mon/mon.js +++ b/mon/mon.js @@ -22,12 +22,13 @@ class Mon { static async run_forever(config) { + let mergedConfig = config; 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' })); - config = { ...fileConfig, config }; + mergedConfig = { ...fileConfig, ...config }; } - let antietcd = await AntiEtcdAdapter.start_antietcd(config); + let antietcd = await AntiEtcdAdapter.start_antietcd(mergedConfig); let mon; const run = () => {