Merge pull request #390 from spiral/feature/switch_to_spiral_errorsv2.0.0-alpha17

Feature/switch to spiral errors

1 files changed, 6 insertions, 4 deletions

diff --git a/sync_worker.go b/sync_worker.go
index 282254e5..a9c53553 100755
--- a/sync_worker.go
+++ b/sync_worker.go
@@ -50,7 +50,8 @@ func (tw *syncWorker) Exec(p Payload) (Payload, error) {
 
 	rsp, err := tw.execPayload(p)
 	if err != nil {
-		if _, ok := err.(ExecError); !ok {
+		// just to be more verbose
+		if errors.Is(errors.Exec, err) == false {
 			tw.w.State().Set(StateErrored)
 			tw.w.State().RegisterExec()
 		}
@@ -95,7 +96,8 @@ func (tw *syncWorker) ExecWithContext(ctx context.Context, p Payload) (Payload,
 
 		rsp, err := tw.execPayload(p)
 		if err != nil {
-			if _, ok := err.(ExecError); !ok {
+			// just to be more verbose
+			if errors.Is(errors.Exec, err) == false {
 				tw.w.State().Set(StateErrored)
 				tw.w.State().RegisterExec()
 			}
@@ -131,7 +133,7 @@ func (tw *syncWorker) ExecWithContext(ctx context.Context, p Payload) (Payload,
 }
 
 func (tw *syncWorker) execPayload(p Payload) (Payload, error) {
-	const op = errors.Op("exec_payload")
+	const op = errors.Op("exec payload")
 	// two things; todo: merge
 	if err := sendControl(tw.w.Relay(), p.Context); err != nil {
 		return EmptyPayload, errors.E(op, err, "header error")
@@ -154,7 +156,7 @@ func (tw *syncWorker) execPayload(p Payload) (Payload, error) {
 	}
 
 	if pr.HasFlag(goridge.PayloadError) {
-		return EmptyPayload, ExecError(rsp.Context)
+		return EmptyPayload, errors.E(op, errors.Exec, errors.Str(string(rsp.Context)))
 	}
 
 	// add streaming support :)