ironbee/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#577] cmd/node: Use new config for node configuration

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-06-01 20:50:46 +03:00 • committed by Alex Vanin
parent 42d18f1322
commit 6ab7efb358
2 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/neofs-node/attributes.go
View file

@ -5,8 +5,9 @@ import (
"strconv"
"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node"
"github.com/nspcc-dev/neofs-node/pkg/util/attributes"
"github.com/spf13/viper"
)
const (
@ -15,8 +16,8 @@ const (
defaultPrice = 0
)
func parseAttributes(v *viper.Viper) []*netmap.NodeAttribute {
stringAttributes := readAttributes(v)
func parseAttributes(c *config.Config) []*netmap.NodeAttribute {
stringAttributes := nodeconfig.Attributes(c)
attrs, err := attributes.ParseV2Attributes(stringAttributes, nil)
if err != nil {
@ -26,21 +27,6 @@ func parseAttributes(v *viper.Viper) []*netmap.NodeAttribute {
return addWellKnownAttributes(attrs)
}
func readAttributes(v *viper.Viper) (attrs []string) {
const maxAttributes = 100
for i := 0; i < maxAttributes; i++ {
attr := v.GetString(cfgNodeAttributePrefix + "_" + strconv.Itoa(i))
if attr == "" {
return
}
attrs = append(attrs, attr)
}
return attrs
}
type wellKnownNodeAttrDesc struct {
explicit bool
defaultVal string