forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 01:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/swarm/swarm-smoke: log error where it occurs

Browse source
This commit is contained in:
Anton Evangelatov 2018-03-30 18:52:43 +02:00
parent 90345e1902
commit 3f81f59ac3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/swarm/swarm-smoke/upload_and_sync.go
View file

@ -15,7 +15,7 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/google/uuid" "github.com/pborman/uuid"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )
@ -43,13 +43,12 @@ func cliUploadAndSync(c *cli.Context) error {
wg := sync.WaitGroup{} wg := sync.WaitGroup{}
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
endpoint := endpoint endpoint := endpoint
ruid := uuid.New().String()[:8] ruid := uuid.New()[:8]
wg.Add(1) wg.Add(1)
go func(endpoint string, ruid string) { go func(endpoint string, ruid string) {
for { for {
err := fetch(hash, endpoint, fhash, ruid) err := fetch(hash, endpoint, fhash, ruid)
if err != nil { if err != nil {
log.Warn(err.Error(), "ruid", ruid)
continue continue
} }
@ -72,23 +71,29 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error {
log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash) log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash)
res, err := http.Get(endpoint + "/bzz:/" + hash) res, err := http.Get(endpoint + "/bzz:/" + hash)
if err != nil { if err != nil {
log.Warn(err.Error(), "ruid", ruid)
return err return err
} }
log.Trace("http get response", "ruid", ruid, "api", endpoint, "hash", hash, "code", res.StatusCode) log.Trace("http get response", "ruid", ruid, "api", endpoint, "hash", hash, "code", res.StatusCode, "len", res.ContentLength)
if res.StatusCode != 200 { if res.StatusCode != 200 {
return fmt.Errorf("expected status code %d, got %v", 200, res.StatusCode) err := fmt.Errorf("expected status code %d, got %v", 200, res.StatusCode)
log.Warn(err.Error(), "ruid", ruid)
return err
} }
defer res.Body.Close() defer res.Body.Close()
rdigest, err := digest(res.Body) rdigest, err := digest(res.Body)
if err != nil { if err != nil {
log.Warn(err.Error(), "ruid", ruid)
return err return err
} }
if !bytes.Equal(rdigest, original) { if !bytes.Equal(rdigest, original) {
return fmt.Errorf("downloaded imported file md5=%x is not the same as the generated one=%x", rdigest, original) err := fmt.Errorf("downloaded imported file md5=%x is not the same as the generated one=%x", rdigest, original)
log.Warn(err.Error(), "ruid", ruid)
return err
} }
log.Trace("downloaded file matches random file", "ruid", ruid, "len", res.ContentLength) log.Trace("downloaded file matches random file", "ruid", ruid, "len", res.ContentLength)