fix unit test and improve recovery middleware

framework/rest/bizerror.go

@@ -1,6 +1,7 @@
 package rest
 
 import (
+	"fmt"
 	"net/http"
 )
 
@@ -50,12 +51,15 @@ func NewBizError(err error, opts ...BizErrorOption) BizError {
 
 // String function is used for printing string representation of a BizError instance
 func (b BizError) String() string {
+	if b.ErrCode > 0 {
+		return fmt.Sprintf("%d %s", b.ErrCode, b.ErrMsg)
+	}
 	return b.ErrMsg
 }
 
 // Error is used for implementing error interface
 func (b BizError) Error() string {
-	return b.String()
+	return b.ErrMsg
 }
 
 func HandleBadRequestErr(err error) {

framework/rest/bizerror_test.go

@@ -14,7 +14,7 @@ func TestWithStatusCode(t *testing.T) {
 		So(bizError.StatusCode, ShouldEqual, 401)
 
 		Convey("Should output Unauthorised", func() {
-			So(bizError.String(), ShouldEqual, "Unauthorised")
+			So(bizError.Error(), ShouldEqual, "Unauthorised")
 		})
 	})
 }
@@ -28,9 +28,5 @@ func TestWithErrCode(t *testing.T) {
 		Convey("Should output 100401 Unauthorised", func() {
 			So(bizError.String(), ShouldEqual, "100401 Unauthorised")
 		})
-
-		Convey("Should have the same output with String()", func() {
-			So(bizError.Error(), ShouldEqual, bizError.String())
-		})
 	})
 }

framework/rest/middleware.go

@@ -3,6 +3,7 @@ package rest
 import (
 	"context"
 	"crypto/subtle"
+	"encoding/json"
 	"fmt"
 	"github.com/apolloconfig/agollo/v4/storage"
 	"github.com/ascarter/requestid"
@@ -232,23 +233,36 @@ func recovery(inner http.Handler) http.Handler {
 		defer func() {
 			if e := recover(); e != nil {
 				statusCode := http.StatusInternalServerError
-				respErr := fmt.Sprintf("%v", e)
+				errCode := 1 // 1 indicates there is an error
+				message := fmt.Sprintf("%v", e)
 				if err, ok := e.(error); ok {
-					if errors.Is(err, context.Canceled) {
+					switch {
+					case errors.Is(err, context.Canceled):
 						statusCode = http.StatusBadRequest
-					} else {
-						var bizErr BizError
-						if errors.As(err, &bizErr) {
-							statusCode = bizErr.StatusCode
-							if bizErr.Cause != nil {
-								e = bizErr.Cause
-							}
-							respErr = bizErr.Error()
+					default:
+						var bizError BizError
+						if errors.As(err, &bizError) {
+							statusCode = bizError.StatusCode
+							errCode = bizError.ErrCode
+							message = bizError.Error()
 						}
 					}
 				}
+				w.WriteHeader(statusCode)
+				if stringutils.IsEmpty(message) {
+					message = http.StatusText(statusCode)
+				}
 				logger.Error().Msgf("panic: %+v\n\nstacktrace from panic: %s\n", e, string(debug.Stack()))
-				http.Error(w, respErr, statusCode)
+				if _err := json.NewEncoder(w).Encode(struct {
+					Code    int    `json:"code"`
+					Message string `json:"message"`
+				}{
+					Code:    errCode,
+					Message: message,
+				}); _err != nil {
+					http.Error(w, _err.Error(), http.StatusInternalServerError)
+					return
+				}
 			}
 		}()
 		inner.ServeHTTP(w, r)