From f185630fdf5c1e0a2f26074804d6780d6786e7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jano=C5=A1=20Gulja=C5=A1?= Date: Thu, 19 Sep 2019 12:28:40 +0200 Subject: [PATCH] cmd/swarm-smoke: fix waitToPushSynced connection closing (#1781) --- cmd/swarm-smoke/upload_and_sync.go | 33 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cmd/swarm-smoke/upload_and_sync.go b/cmd/swarm-smoke/upload_and_sync.go index 5f0a045da6..802ba92390 100644 --- a/cmd/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm-smoke/upload_and_sync.go @@ -333,24 +333,25 @@ func waitToPushSynced(tagname string) { for { time.Sleep(200 * time.Millisecond) - rpcClient, err := rpc.Dial(wsEndpoint(hosts[0])) - if rpcClient != nil { - defer rpcClient.Close() - } - if err != nil { - log.Error("error dialing host", "err", err) - continue - } - - bzzClient := client.NewBzz(rpcClient) + if func() (synced bool) { + rpcClient, err := rpc.Dial(wsEndpoint(hosts[0])) + if rpcClient != nil { + defer rpcClient.Close() + } + if err != nil { + log.Error("error dialing host", "err", err) + return false + } - synced, err := bzzClient.IsPushSynced(tagname) - if err != nil { - log.Error(err.Error()) - continue - } + bzzClient := client.NewBzz(rpcClient) - if synced { + synced, err = bzzClient.IsPushSynced(tagname) + if err != nil { + log.Error(err.Error()) + return false + } + return synced + }() { return } }