From 119f67d20de56f5d9032bd8bc7cc513dff30e89c Mon Sep 17 00:00:00 2001 From: "M@" Date: Thu, 4 Dec 2025 16:51:14 -0500 Subject: [PATCH] loadFeatureToggles in settings parsing --- pkg/setting/setting.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index f7a6cef2ab2..fe4b1709215 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -980,6 +980,10 @@ func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) { defaultConfigFile := path.Join(cfg.HomePath, "conf/defaults.ini") cfg.configFiles = append(cfg.configFiles, defaultConfigFile) + // M@ DEBUG do not commit + cfg.Logger.Info("In loadConfiguration M@-----------") + fmt.Printf("In loadConfiguration M@-----------\n") + // check if config file exists if _, err := os.Stat(defaultConfigFile); os.IsNotExist(err) { fmt.Println("Grafana-server Init Failed: Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath") @@ -1019,9 +1023,7 @@ func (cfg *Cfg) loadConfiguration(args CommandLineArgs) (*ini.File, error) { // apply command line overrides cfg.applyCommandLineProperties(commandLineProps, parsedFile) - // --- ADD THIS LINE TO LOAD FEATURE TOGGLES FROM THE FINAL PARSED INI --- loadFeatureToggles(parsedFile) - // // evaluate config values containing environment variables err = expandConfig(parsedFile)