always log request details when cancelled

Author: linkdata

errpendingcancelled.go

@@ -0,0 +1,40 @@
+package jaws
+
+import (
+	"fmt"
+
+	"github.com/linkdata/jaws/lib/assets"
+)
+
+// ErrRequestCancelled indicates a Request was cancelled. Use Unwrap() to see the underlying cause.
+var ErrRequestCancelled errRequestCancelled
+
+type errRequestCancelled struct {
+	JawsKey uint64
+	Cause   error
+	Initial string
+}
+
+func (e errRequestCancelled) Error() string {
+	return fmt.Sprintf("Request<%s>:%s %v", assets.JawsKeyString(e.JawsKey), e.Initial, e.Cause)
+}
+
+func (e errRequestCancelled) Is(target error) (yes bool) {
+	return target == ErrRequestCancelled
+}
+
+func (e errRequestCancelled) Unwrap() error {
+	return e.Cause
+}
+
+func newErrRequestCancelledLocked(rq *Request, cause error) (err error) {
+	var initial string
+	if rq.initial != nil {
+		initial = fmt.Sprintf(" %s %q:", rq.initial.Method, rq.initial.RequestURI)
+	}
+	return errRequestCancelled{
+		JawsKey: rq.JawsKey,
+		Cause:   cause,
+		Initial: initial,
+	}
+}

errrequestcancelled.go

@@ -339,10 +339,7 @@ func (rq *Request) maintenance(now time.Time, requestTimeout time.Duration) bool
 
 func (rq *Request) cancelLocked(err error) {
 	if rq.JawsKey != 0 && rq.ctx.Err() == nil {
-		if !rq.running.Load() {
-			err = newErrPendingCancelledLocked(rq, err)
-		}
-		rq.cancelFn(rq.Jaws.Log(err))
+		rq.cancelFn(rq.Jaws.Log(newErrRequestCancelledLocked(rq, err)))
 	}
 }
 

request.go

@@ -1036,13 +1036,13 @@ func TestRequest_CustomErrors(t *testing.T) {
 	rq := newTestRequest(t)
 	defer rq.Close()
 	cause := newErrNoWebSocketRequest(rq.Request)
-	err := newErrPendingCancelledLocked(rq.Request, cause)
-	th.True(errors.Is(err, ErrPendingCancelled))
+	err := newErrRequestCancelledLocked(rq.Request, cause)
+	th.True(errors.Is(err, ErrRequestCancelled))
 	th.True(errors.Is(err, ErrNoWebSocketRequest))
-	th.Equal(errors.Is(cause, ErrPendingCancelled), false)
+	th.Equal(errors.Is(cause, ErrRequestCancelled), false)
 	var target1 errNoWebSocketRequest
 	th.True(errors.As(err, &target1))
-	var target2 errPendingCancelled
+	var target2 errRequestCancelled
 	th.Equal(errors.As(cause, &target2), false)
 }