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

[#493] node: Replace relay config value to node section

Browse source 
Set default value to `false`.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-05-12 12:29:19 +03:00 committed by Leonard Lyubich
parent f90fc86ec8
commit d36084c26a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/neofs-node/config.go
View file

@ -64,6 +64,7 @@ const (
cfgNodeKey = "node.key" cfgNodeKey = "node.key"
cfgBootstrapAddress = "node.address" cfgBootstrapAddress = "node.address"
cfgNodeAttributePrefix = "node.attribute" cfgNodeAttributePrefix = "node.attribute"
cfgNodeRelay = "node.relay"
// config keys for cfgGRPC // config keys for cfgGRPC
cfgListenAddress = "grpc.endpoint" cfgListenAddress = "grpc.endpoint"
@ -96,8 +97,6 @@ const (
cfgReplicatorPutTimeout = "replicator.put_timeout" cfgReplicatorPutTimeout = "replicator.put_timeout"
cfgReBootstrapRelay = "bootstrap.relay_only"
cfgObjectPutPoolSize = "pool.object.put.size" cfgObjectPutPoolSize = "pool.object.put.size"
cfgObjectGetPoolSize = "pool.object.get.size" cfgObjectGetPoolSize = "pool.object.get.size"
cfgObjectHeadPoolSize = "pool.object.head.size" cfgObjectHeadPoolSize = "pool.object.head.size"
@ -354,7 +353,7 @@ func initCfg(path string) *cfg {
reputationWorkerPool, err := ants.NewPool(notificationHandlerPoolSize) reputationWorkerPool, err := ants.NewPool(notificationHandlerPoolSize)
fatalOnErr(err) fatalOnErr(err)
relayOnly := viperCfg.GetBool(cfgReBootstrapRelay) relayOnly := viperCfg.GetBool(cfgNodeRelay)
c := &cfg{ c := &cfg{
ctx: context.Background(), ctx: context.Background(),
@ -431,6 +430,7 @@ func initViper(path string) *viper.Viper {
func defaultConfiguration(v *viper.Viper) { func defaultConfiguration(v *viper.Viper) {
v.SetDefault(cfgNodeKey, "") // node key v.SetDefault(cfgNodeKey, "") // node key
v.SetDefault(cfgBootstrapAddress, "") // announced address of the node v.SetDefault(cfgBootstrapAddress, "") // announced address of the node
v.SetDefault(cfgNodeRelay, false)
v.SetDefault(cfgMorphRPCAddress, []string{}) v.SetDefault(cfgMorphRPCAddress, []string{})
v.SetDefault(cfgMorphNotifyRPCAddress, []string{}) v.SetDefault(cfgMorphNotifyRPCAddress, []string{})