From d897867d6ad36ebd476a6f76f9f76adb3633e640 Mon Sep 17 00:00:00 2001 From: postmannen Date: Mon, 23 Aug 2021 11:45:31 +0200 Subject: [PATCH] turned off configfolder as flag value. Keeping just env --- configuration_flags.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configuration_flags.go b/configuration_flags.go index a2ea56c..15b326f 100644 --- a/configuration_flags.go +++ b/configuration_flags.go @@ -179,8 +179,13 @@ func (c *Configuration) CheckFlags() error { // Create an empty default config var fc Configuration - // Read file config. Set system default if it can't find config file. + // Set default configfolder if no env was provided. configFolder := os.Getenv("CONFIGFOLDER") + if configFolder == "" { + c.ConfigFolder = "./etc/" + } + + // Read file config. Set system default if it can't find config file. fc, err := c.ReadConfigFile(configFolder) if err != nil { log.Printf("%v\n", err) @@ -189,7 +194,7 @@ func (c *Configuration) CheckFlags() error { *c = fc - flag.StringVar(&c.ConfigFolder, "configFolder", fc.ConfigFolder, "Defaults to ./usr/local/steward/etc/. *NB* This flag is not used, if your config file are located somwhere else than default set the location in an env variable named CONFIGFOLDER") + //flag.StringVar(&c.ConfigFolder, "configFolder", fc.ConfigFolder, "Defaults to ./usr/local/steward/etc/. *NB* This flag is not used, if your config file are located somwhere else than default set the location in an env variable named CONFIGFOLDER") flag.StringVar(&c.SocketFolder, "socketFolder", fc.SocketFolder, "folder who contains the socket file. Defaults to ./tmp/. If other folder is used this flag must be specified at startup.") flag.StringVar(&c.DatabaseFolder, "databaseFolder", fc.DatabaseFolder, "folder who contains the database file. Defaults to ./var/lib/. If other folder is used this flag must be specified at startup.") flag.StringVar(&c.NodeName, "nodeName", fc.NodeName, "some unique string to identify this Edge unit")