a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runservice: improve errors in logsHandler 

* return errNotExist in readTaskLogs when the executor task doesn't exist: so
the client will receive a 404 instead of a 500 (since a generic error will be
mapped to a 500).
* Wrap the errNotExist returned by readTaskLogs with a new ErrNotExits reporting
"log doesn't exist"
This commit is contained in:
Simone Gotti 2019-11-13 15:46:26 +01:00
parent 9fd4b662a8
commit 66e182a55d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/services/runservice/api/api.go
View File

@ -195,9 +195,9 @@ func (h *LogsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if sendError { if sendError {
switch { switch {
case util.IsNotExist(err): case util.IsNotExist(err):
http.Error(w, err.Error(), http.StatusNotFound) httpError(w, util.NewErrNotExist(errors.Errorf("log doesn't exist: %w", err)))
default: default:
http.Error(w, err.Error(), http.StatusInternalServerError) httpError(w, err)
} }
} }
} }
@ -241,15 +241,18 @@ func (h *LogsHandler) readTaskLogs(ctx context.Context, runID, taskID string, se
et, err := store.GetExecutorTask(ctx, h.e, task.ID) et, err := store.GetExecutorTask(ctx, h.e, task.ID)
if err != nil { if err != nil {
if err == etcd.ErrKeyNotFound {
return util.NewErrNotExist(errors.Errorf("executor task with id %q doesn't exist", task.ID)), true
}
return err, true return err, true
} }
executor, err := store.GetExecutor(ctx, h.e, et.Spec.ExecutorID) executor, err := store.GetExecutor(ctx, h.e, et.Spec.ExecutorID)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil {
if err == etcd.ErrKeyNotFound {
return util.NewErrNotExist(errors.Errorf("executor with id %q doesn't exist", et.Spec.ExecutorID)), true
}
return err, true return err, true
} }
if executor == nil {
return util.NewErrNotExist(errors.Errorf("executor with id %q doesn't exist", et.Spec.ExecutorID)), true
}
var url string var url string
if setup { if setup {