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

[#2091] morph/client: Do not use deprecated methods

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-11-03 15:44:59 +03:00 • committed by fyrchik
parent 51e886dd67
commit 6af52c46d8
5 changed files with 33 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkg/morph/client/multi.go
View file

@ -36,7 +36,7 @@ func (c *Client) switchRPC() bool {
// Iterate endpoints in the order of decreasing priority.
for c.endpoints.curr = range c.endpoints.list {
newEndpoint := c.endpoints.list[c.endpoints.curr].Address
cli, act, gas, err := c.newCli(newEndpoint)
cli, act, err := c.newCli(newEndpoint)
if err != nil {
c.logger.Warn("could not establish connection to the switched RPC node",
zap.String("endpoint", newEndpoint),
@ -62,8 +62,7 @@ func (c *Client) switchRPC() bool {
}
c.client = cli
c.rpcActor = act
c.gasToken = gas
c.setActor(act)
if c.cfg.switchInterval != 0 && !c.switchIsActive.Load() &&
c.endpoints.list[c.endpoints.curr].Priority != c.endpoints.list[0].Priority {
@ -165,7 +164,7 @@ mainLoop:
tryE := e.Address
cli, act, gas, err := c.newCli(tryE)
cli, act, err := c.newCli(tryE)
if err != nil {
c.logger.Warn("could not create client to the higher priority node",
zap.String("endpoint", tryE),
@ -188,8 +187,7 @@ mainLoop:
c.client.Close()
c.cache.invalidate()
c.client = cli
c.rpcActor = act
c.gasToken = gas
c.setActor(act)
c.endpoints.curr = i
c.switchLock.Unlock()