diff --git a/config/conf_loader.go b/config/conf_loader.go index 7c3bce1..1607907 100644 --- a/config/conf_loader.go +++ b/config/conf_loader.go @@ -23,12 +23,11 @@ import ( * The configuration loader will give priority to the local file over the default file */ -func GetConfLoader() *onion.Onion { +func GetConfLoader(appName string) *onion.Onion { logger := zerolog.New(os.Stdout).With().Timestamp().Logger() - AppName := GetAppName() EnvPrefix := "OC_" - defaultConfigFile := "/etc/oc/" + AppName[3:] + ".json" - localConfigFile := "./" + AppName[3:] + ".json" + defaultConfigFile := "/etc/oc/" + appName[3:] + ".json" + localConfigFile := "./" + appName[3:] + ".json" var configFile string var o *onion.Onion l3 := GetEnvVarLayer(EnvPrefix) diff --git a/entrypoint.go b/entrypoint.go index 3f86862..9ffb85d 100644 --- a/entrypoint.go +++ b/entrypoint.go @@ -139,7 +139,7 @@ func InitDaemon(appName string) { // create a temporary console logger for init logs.SetLogger(logs.CreateLogger("main")) // Load the right config file - o := GetConfLoader() + o := GetConfLoader(appName) // resources.InitNative() // feed the library with the loaded config SetConfig( @@ -272,8 +272,8 @@ func GetConfig() *config.Config { * The configuration loader will give priority to the local file over the default file */ -func GetConfLoader() *onion.Onion { - return config.GetConfLoader() +func GetConfLoader(appName string) *onion.Onion { + return config.GetConfLoader(appName) } type Request struct {