engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make config lower priority than args

Browse source
This commit is contained in:
Boshi Lian 2018-02-21 07:04:35 +08:00
parent 046dd29fc1
commit e89f739ce2
1 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

51
sshpiperd/cmd.go
View file

@ -56,6 +56,25 @@ func addPlugins(parser *flags.Parser, name string, pluginNames []string, getter
}
}
func populateFromConfig(ini *flags.IniParser, data interface{}, longopt string) error {
parser := flags.NewParser(data, flags.IgnoreUnknown)
parser.Parse()
o := parser.FindOptionByLongName(longopt)
file := o.Value().(flags.Filename)
err := ini.ParseFile(string(file))
if err != nil {
// set by user
if !o.IsSetDefault() {
return err
}
}
return nil
}
func main() {
parser := flags.NewNamedParser("sshpiperd", flags.Default)
@ -88,8 +107,10 @@ func main() {
config := &struct {
piperdConfig
Logfile string `long:"log" description:"Logfile path. Leave empty or any error occurs will fall back to stdout" env:"SSHPIPERD_LOG_PATH" ini-name:"log-path"`
ConfigFile flags.Filename `long:"config" description:"Config file path. Higher priority than arg options and environment variables" default:"/etc/sshpiperd.ini" env:"SSHPIPERD_CONFIG_FILE" no-ini:"true"`
Logfile string `long:"log" description:"Logfile path. Leave empty or any error occurs will fall back to stdout" env:"SSHPIPERD_LOG_PATH" ini-name:"log-path"`
// need to be shown in help, or will be moved to populate config
ConfigFile flags.Filename `long:"config" description:"Config file path. Will be overwriten by arg options and environment variables" default:"/etc/sshpiperd.ini" env:"SSHPIPERD_CONFIG_FILE" no-ini:"true"`
}{}
addOpt(parser, "sshpiperd", config)
@ -98,6 +119,14 @@ func main() {
addPlugins(parser, "challenger", challenger.All(), func(n string) registry.Plugin { return challenger.Get(n) })
addPlugins(parser, "auditor", auditor.All(), func(n string) registry.Plugin { return auditor.Get(n) })
// populate by config
ini := flags.NewIniParser(parser)
err := populateFromConfig(ini, config, "config")
if err != nil {
fmt.Println(fmt.Sprintf("load config file failed %v", err))
os.Exit(1)
}
parser.CommandHandler = func(command flags.Commander, args []string) error {
// no subcommand called, start to serve
@ -121,21 +150,5 @@ func main() {
return command.Execute(args)
}
if _, err := parser.Parse(); err != nil {
return
}
o := parser.FindOptionByLongName("config")
ini := flags.NewIniParser(parser)
err := ini.ParseFile(string(config.ConfigFile))
if err != nil {
// set by user
if !o.IsSetDefault() {
fmt.Printf("load config file %v failed %v", config.ConfigFile, err)
fmt.Println()
os.Exit(1)
}
}
parser.Parse()
}