mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-22 06:21:40 +01:00
Code Issues Projects Releases Wiki Activity

config: fix reflection parsing in LiT

Browse source 
In the case where lnd's config struct is embedded inside another struct
(for example in lightning-terminal), the flag won't be found under its
original name. So we try to also look it up under the prefixed name.
This commit is contained in:
Oliver Gugger 2021-10-21 20:03:58 +02:00
parent 6450f0c080
commit c02bf19fc5
No known key found for this signature in database
GPG key ID: 8E4256593F177720
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
config.go
View file

@ -717,21 +717,43 @@ func ValidateConfig(cfg Config, usageMessage string,
// IsSet returns true if an option has been set in either the config
// file or by a flag.
isSet := func(field string) bool {
fieldname, ok := reflect.TypeOf(Config{}).FieldByName(field)
fieldName, ok := reflect.TypeOf(Config{}).FieldByName(field)
if !ok {
fmt.Fprintf(os.Stderr, "could not find field %s\n", field)
str := "%s: could not find field %s"
err := fmt.Errorf(str, funcName, field)
_, _ = fmt.Fprintln(os.Stderr, err)
return false
}
long, ok := fieldname.Tag.Lookup("long")
long, ok := fieldName.Tag.Lookup("long")
if !ok {
fmt.Fprintf(os.Stderr,
"field %s does not have a long tag\n", field)
str := "%s: field %s does not have a long tag"
err := fmt.Errorf(str, funcName, field)
_, _ = fmt.Fprintln(os.Stderr, err)
return false
}
return fileParser.FindOptionByLongName(long).IsSet() ||
flagParser.FindOptionByLongName(long).IsSet()
// The user has the option to set the flag in either the config
// file or as a command line flag. If any is set, we consider it
// to be set, not applying any precedence rules here (since it
// is a boolean the default is false anyway which would screw up
// any precedence rules). Additionally, we need to also support
// the use case where the config struct is embedded _within_
// another struct with a prefix (as is the case with
// lightning-terminal).
fileOption := fileParser.FindOptionByLongName(long)
fileOptionNested := fileParser.FindOptionByLongName(
"lnd." + long,
)
flagOption := flagParser.FindOptionByLongName(long)
flagOptionNested := flagParser.FindOptionByLongName(
"lnd." + long,
)
return (fileOption != nil && fileOption.IsSet()) ||
(fileOptionNested != nil && fileOptionNested.IsSet()) ||
(flagOption != nil && flagOption.IsSet()) ||
(flagOptionNested != nil && flagOptionNested.IsSet())
}
// As soon as we're done parsing configuration options, ensure all paths