From 24136f8b158c236ff6d8daae3ffed80e5d128b26 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Thu, 14 Sep 2023 10:47:18 +0200 Subject: [PATCH] we didn't reset the main configuration, causing some config vars still to be set --- machinery/src/config/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/machinery/src/config/main.go b/machinery/src/config/main.go index 6dceb56..dc5805e 100644 --- a/machinery/src/config/main.go +++ b/machinery/src/config/main.go @@ -141,8 +141,13 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) { }, ) - // Merge Config toplevel + // Reset main configuration Config. + configuration.Config = models.Config{} + + // Merge the global settings in the main config conjungo.Merge(&configuration.Config, configuration.GlobalConfig, opts) + + // Now we might override some settings with the custom config conjungo.Merge(&configuration.Config, configuration.CustomConfig, opts) // Merge Kerberos Vault settings