export http status code

request/error.go

@@ -1,5 +1,10 @@
 package request
 
 type HTTPError struct {
-	Msg string `json:"msg" example:"status bad request"`
+	Status int    `json:"status" example:"http status code"`
+	Msg    string `json:"msg" example:"status bad request"`
+}
+
+func (e HTTPError) Error() string {
+	return e.Msg
 }

request/request.go

@@ -3,10 +3,8 @@ package request
 import (
 	"fmt"
 	"net/http"
-	"runtime"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 )
 
 type Checker interface {
@@ -15,17 +13,34 @@ type Checker interface {
 
 func ParseParamFail(ctx *gin.Context, r interface{}, fs ...func() error) bool {
 	if r != nil {
-		if Fail(ctx, http.StatusBadRequest, ctx.ShouldBind(r)) {
+		err := ctx.ShouldBind(r)
+		if err != nil {
+			err = HTTPError{Status: http.StatusBadRequest, Msg: err.Error()}
+		}
+
+		if Fail(ctx, err) {
 			return true
 		}
 
 		if checker, ok := r.(Checker); ok {
-			return Fail(ctx, http.StatusBadRequest, checker.Check())
+			err := checker.Check()
+			if err != nil {
+				err = HTTPError{Status: http.StatusBadRequest, Msg: err.Error()}
+			}
+
+			if Fail(ctx, err) {
+				return true
+			}
 		}
 	}
 
 	for _, f := range fs {
-		if Fail(ctx, http.StatusBadRequest, f()) {
+		err := f()
+		if err != nil {
+			err = HTTPError{Status: http.StatusBadRequest, Msg: err.Error()}
+		}
+
+		if Fail(ctx, err) {
 			return true
 		}
 	}
@@ -33,18 +48,18 @@ func ParseParamFail(ctx *gin.Context, r interface{}, fs ...func() error) bool {
 	return false
 }
 
-func Fail(ctx *gin.Context, status int, err error) bool {
+func Fail(ctx *gin.Context, err error) bool {
 	if err == nil {
 		return false
 	}
 
-	ctx.JSON(status, HTTPError{Msg: err.Error()})
-
-	if status == http.StatusInternalServerError {
-		_, file, line, _ := runtime.Caller(1)
-		logrus.WithField("err", err).Errorf("file:%s line:%d", file, line)
+	status := http.StatusInternalServerError
+	if v, ok := err.(HTTPError); ok {
+		status = v.Status
 	}
 
+	ctx.JSON(status, gin.H{"msg": err.Error()})
+
 	return true
 }