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

swarm/api: get rid of endless loop on readall

Browse source
This commit is contained in:
Anton Evangelatov 2018-04-22 14:26:07 +02:00
parent f88ac098cb
commit b68c2d35d8
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
swarm/api/http/server.go
View file

@ -577,16 +577,13 @@ func (s *Server) HandleGet(w http.ResponseWriter, r *Request) {
var res []byte
var err error
for {
res, err = ioutil.ReadAll(reader)
if err != nil {
log.Error("handle.get", "ruid", r.ruid, "error", err)
time.Sleep(200 * time.Millisecond)
continue
}
log.Debug("handle.get.readall success", "ruid", r.ruid)
break
res, err = ioutil.ReadAll(reader)
if err != nil {
log.Error("handle.get", "ruid", r.ruid, "error", err)
Respond(w, r, fmt.Sprintf("chunk not found: %s", err), http.StatusNotFound)
return
}
log.Debug("handle.get.readall success", "ruid", r.ruid)
rdr := bytes.NewReader(res)
@ -845,16 +842,13 @@ func (s *Server) HandleGetFile(w http.ResponseWriter, r *Request) {
}
var res []byte
for {
res, err = ioutil.ReadAll(reader)
if err != nil {
log.Error("handle.get.file", "ruid", r.ruid, "error", err)
time.Sleep(200 * time.Millisecond)
continue
}
log.Debug("handle.get.file.readall success", "ruid", r.ruid)
break
res, err = ioutil.ReadAll(reader)
if err != nil {
log.Error("handle.get.file", "ruid", r.ruid, "error", err)
Respond(w, r, fmt.Sprintf("chunk not found %s: %s", r.uri, err), http.StatusNotFound)
return
}
log.Debug("handle.get.file.readall success", "ruid", r.ruid)
rdr := bytes.NewReader(res)