cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

stores: Fix error printing in http handler

Browse Source
This commit is contained in:
Łukasz Magiera 2020-09-28 22:05:51 +02:00
parent bf554d0e43
commit 9bd2537971
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/lotus-seal-worker/main.go
View File

@ -443,7 +443,6 @@ var runCmd = &cli.Command{
// TODO: we could get rid of this, but that requires tracking resources for restarted tasks correctly // TODO: we could get rid of this, but that requires tracking resources for restarted tasks correctly
workerApi.LocalWorker.WaitQuiet() workerApi.LocalWorker.WaitQuiet()
if err := nodeApi.WorkerConnect(ctx, "ws://"+address+"/rpc/v0"); err != nil { if err := nodeApi.WorkerConnect(ctx, "ws://"+address+"/rpc/v0"); err != nil {
log.Errorf("Registering worker failed: %+v", err) log.Errorf("Registering worker failed: %+v", err)
cancel() cancel()

18
extern/sector-storage/stores/http_handler.go vendored
View File

@ -58,14 +58,14 @@ func (handler *FetchHandler) remoteGetSector(w http.ResponseWriter, r *http.Requ
id, err := storiface.ParseSectorID(vars["id"]) id, err := storiface.ParseSectorID(vars["id"])
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
ft, err := ftFromString(vars["type"]) ft, err := ftFromString(vars["type"])
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
@ -75,7 +75,7 @@ func (handler *FetchHandler) remoteGetSector(w http.ResponseWriter, r *http.Requ
// passing 0 spt because we don't allocate anything // passing 0 spt because we don't allocate anything
paths, _, err := handler.Local.AcquireSector(r.Context(), id, 0, ft, storiface.FTNone, storiface.PathStorage, storiface.AcquireMove) paths, _, err := handler.Local.AcquireSector(r.Context(), id, 0, ft, storiface.FTNone, storiface.PathStorage, storiface.AcquireMove)
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
@ -91,7 +91,7 @@ func (handler *FetchHandler) remoteGetSector(w http.ResponseWriter, r *http.Requ
stat, err := os.Stat(path) stat, err := os.Stat(path)
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
@ -105,14 +105,14 @@ func (handler *FetchHandler) remoteGetSector(w http.ResponseWriter, r *http.Requ
w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Type", "application/octet-stream")
} }
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
w.WriteHeader(200) w.WriteHeader(200)
if _, err := io.Copy(w, rd); err != nil { // TODO: default 32k buf may be too small if _, err := io.Copy(w, rd); err != nil { // TODO: default 32k buf may be too small
log.Error("%+v", err) log.Errorf("%+v", err)
return return
} }
} }
@ -123,20 +123,20 @@ func (handler *FetchHandler) remoteDeleteSector(w http.ResponseWriter, r *http.R
id, err := storiface.ParseSectorID(vars["id"]) id, err := storiface.ParseSectorID(vars["id"])
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
ft, err := ftFromString(vars["type"]) ft, err := ftFromString(vars["type"])
if err != nil { if err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }
if err := handler.Remove(r.Context(), id, ft, false); err != nil { if err := handler.Remove(r.Context(), id, ft, false); err != nil {
log.Error("%+v", err) log.Errorf("%+v", err)
w.WriteHeader(500) w.WriteHeader(500)
return return
} }