From 3132bce2a8166e3f9818059af4de8d69a09bbf12 Mon Sep 17 00:00:00 2001 From: dakkar Date: Thu, 19 Dec 2024 09:57:42 +0000 Subject: move more code in the factory --- config/config.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/config.go') diff --git a/config/config.go b/config/config.go index 3c93d53..c28fa14 100644 --- a/config/config.go +++ b/config/config.go @@ -87,10 +87,10 @@ func addConfigFromFile(configRelPath string) error { return nil } -func loadConfigFromFile(path string) (MainConfig, error) { - pathFromEnv := os.Getenv("EXAMPLE_CONFIG") - if pathFromEnv != "" { - path = pathFromEnv +func loadConfigFromFile() (MainConfig, error) { + path := os.Getenv("EXAMPLE_CONFIG") + if path == "" { + path = "." } err := addConfigFromFile(path) @@ -115,12 +115,12 @@ func loadConfigFromFile(path string) (MainConfig, error) { return config, nil } -func GetMainConfig(path string) (MainConfig, error) { +func GetMainConfig() (MainConfig, error) { addLoggerOptions() addSomethingOptions() pflag.Parse() viper.BindPFlags(pflag.CommandLine) //nolint:errcheck - return loadConfigFromFile(path) + return loadConfigFromFile() } -- cgit v1.2.3