From 9b536267ea07604a7f9e1919efa1301c60d493ff Mon Sep 17 00:00:00 2001 From: Jan Halfar Date: Tue, 11 Jul 2017 18:59:34 +0200 Subject: [PATCH] refactored main module handling --- foomo-bert/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/foomo-bert/main.go b/foomo-bert/main.go index 36e5eb4..3fd749f 100644 --- a/foomo-bert/main.go +++ b/foomo-bert/main.go @@ -39,7 +39,7 @@ func foomoFlagsetReset() (fs *flag.FlagSet, f *foomoFlagsReset) { f.runMode = getFlagRunMode(fs) f.dir = getFlagDir(fs) f.address = fs.String("addr", "", "address of the foomo server") - f.mainModule = fs.String("main-module", "Foomo", "name of main module") + f.mainModule = fs.String("main-module", "", "name of main module") return fs, f } @@ -76,7 +76,12 @@ func validateFlagsReset(f *foomoFlagsReset) (err error) { flagOrEnv(fp.dir, envNameDir) flagOrEnv(fp.runMode, envNameRunMode) flagOrEnv(f.address, envNameAddr) + flagOrEnv(f.mainModule, envNameMainModule) + if *f.mainModule == "" { + mainModule := "Foomo" + f.mainModule = &mainModule + } prepareErr := validateFlagsPrepare(fp) if prepareErr != nil { return prepareErr