george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#493] node: Replace configuration of API clients to a separated section

Browse source 
Replace dial timeout of API client connection from `grpc` section to
`apiclient` since this value is semantically decoupled from the transport
protocol.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-05-12 11:04:51 +03:00 committed by Leonard Lyubich
parent 31eb6617fc
commit acd63afd48
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,9 @@ const (
// config keys for cfgGRPC // config keys for cfgGRPC
cfgListenAddress = "grpc.endpoint" cfgListenAddress = "grpc.endpoint"
cfgDialTimeout = "grpc.dial_timeout"
// config keys for API client cache
cfgAPIClientDialTimeout = "apiclient.dial_timeout"
// config keys for cfgMorph // config keys for cfgMorph
cfgMorphRPCAddress = "morph.rpc_endpoint" cfgMorphRPCAddress = "morph.rpc_endpoint"
@ -465,7 +467,8 @@ func defaultConfiguration(v *viper.Viper) {
v.SetDefault(cfgMorphNotifyDialTimeout, 5*time.Second) v.SetDefault(cfgMorphNotifyDialTimeout, 5*time.Second)
v.SetDefault(cfgListenAddress, "127.0.0.1:50501") // listen address v.SetDefault(cfgListenAddress, "127.0.0.1:50501") // listen address
v.SetDefault(cfgDialTimeout, 5*time.Second)
v.SetDefault(cfgAPIClientDialTimeout, 5*time.Second)
v.SetDefault(cfgAccountingContract, "1aeefe1d0dfade49740fff779c02cd4a0538ffb1") v.SetDefault(cfgAccountingContract, "1aeefe1d0dfade49740fff779c02cd4a0538ffb1")
v.SetDefault(cfgAccountingFee, "1") v.SetDefault(cfgAccountingFee, "1")

2
cmd/neofs-node/object.go
View file

@ -168,7 +168,7 @@ func initObjectService(c *cfg) {
nodeOwner.SetNeo3Wallet(neo3Wallet) nodeOwner.SetNeo3Wallet(neo3Wallet)
clientCache := cache.NewSDKClientCache( clientCache := cache.NewSDKClientCache(
client.WithDialTimeout(c.viper.GetDuration(cfgDialTimeout))) client.WithDialTimeout(c.viper.GetDuration(cfgAPIClientDialTimeout)))
clientConstructor := &reputationClientConstructor{ clientConstructor := &reputationClientConstructor{
log: c.log, log: c.log,