update

Author: admpub

engine/errors.go

@@ -3,5 +3,6 @@ package engine
 import "errors"
 
 var (
-	ErrUnsupported = errors.New(`Unsupported`)
+	ErrUnsupported      = errors.New(`Unsupported`)
+	ErrAlreadyCommitted = errors.New(`response already committed`)
 )

engine/fasthttp/response.go

@@ -5,7 +5,7 @@ package fasthttp
 
 import (
 	"bufio"
-	"errors"
+	"fmt"
 	"io"
 	"net"
 	"net/http"
@@ -19,8 +19,6 @@ import (
 	"github.com/webx-top/echo/logger"
 )
 
-var ErrAlreadyCommitted = errors.New(`response already committed`)
-
 type Response struct {
 	request           *Request
 	header            engine.Header
@@ -52,9 +50,19 @@ func (r *Response) Header() engine.Header {
 	return r.header
 }
 
+func (r *Response) requestURI() string {
+	if len(r.request.context.RequestURI()) > 0 {
+		return r.request.URI()
+	}
+	if r.request.context.URI() != nil {
+		return engine.Bytes2str(r.request.context.URI().Path())
+	}
+	return `-`
+}
+
 func (r *Response) WriteHeader(code int) {
 	if r.committed {
-		r.logger.Warn(ErrAlreadyCommitted.Error())
+		r.logger.Warnf(`%v [%v]`, engine.ErrAlreadyCommitted, r.requestURI())
 		return
 	}
 	r.status = code
@@ -264,7 +272,7 @@ func (w *netHTTPResponseWriter) WriteHeader(statusCode int) {
 
 func (w *netHTTPResponseWriter) Write(b []byte) (int, error) {
 	if w.response.committed {
-		return 0, ErrAlreadyCommitted
+		return 0, fmt.Errorf(`%w [%v]`, engine.ErrAlreadyCommitted, w.response.requestURI())
 	}
 	return w.response.Write(b)
 }

engine/mock/response.go

@@ -36,7 +36,7 @@ func (r *Response) Header() engine.Header {
 
 func (r *Response) WriteHeader(code int) {
 	if r.Committed() {
-		r.logger.Warn("response already committed")
+		r.logger.Warn(engine.ErrAlreadyCommitted.Error())
 		return
 	}
 
@@ -49,7 +49,7 @@ func (r *Response) WriteHeader(code int) {
 
 func (r *Response) writeHeaderNoLock(code int) {
 	if r.committed {
-		r.logger.Warn("response already committed")
+		r.logger.Warn(engine.ErrAlreadyCommitted.Error())
 		return
 	}
 

engine/standard/response.go

@@ -40,9 +40,19 @@ func (r *Response) Header() engine.Header {
 	return r.header
 }
 
+func (r *Response) requestURI() string {
+	if len(r.request.RequestURI) > 0 {
+		return r.request.RequestURI
+	}
+	if r.request.URL != nil {
+		return r.request.URL.Path
+	}
+	return `-`
+}
+
 func (r *Response) WriteHeader(code int) {
 	if r.committed {
-		r.logger.Warn("response already committed")
+		r.logger.Warnf("%v [%s]", engine.ErrAlreadyCommitted, r.requestURI())
 		return
 	}
 	r.status = code