From 62bbde7936109d18bf1f727974719804dad4c105 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Thu, 3 Jun 2021 14:54:06 +0300 Subject: - Do not write an error into the responseWriter if this is internal error - Handle SoftJob error Signed-off-by: Valery Piashchynski --- pkg/worker_handler/response.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/worker_handler/response.go') diff --git a/pkg/worker_handler/response.go b/pkg/worker_handler/response.go index 1763d304..cbf22794 100644 --- a/pkg/worker_handler/response.go +++ b/pkg/worker_handler/response.go @@ -4,8 +4,8 @@ import ( "io" "net/http" "strings" - "sync" + "github.com/spiral/errors" "github.com/spiral/roadrunner/v2/pkg/payload" ) @@ -19,14 +19,14 @@ type Response struct { // associated Body payload. Body interface{} - sync.Mutex } // NewResponse creates new response based on given pool payload. func NewResponse(p payload.Payload) (*Response, error) { + const op = errors.Op("http_response") r := &Response{Body: p.Body} if err := json.Unmarshal(p.Context, r); err != nil { - return nil, err + return nil, errors.E(op, errors.Decode, err) } return r, nil -- cgit v1.2.3