add skip on error and err handler

Author: Shareed2k

go.mod

@@ -4,7 +4,6 @@ go 1.14
 
 require (
 	github.com/go-redis/redis/v7 v7.2.0
-	github.com/imdario/mergo v0.3.9
 	github.com/labstack/echo/v4 v4.1.16
 	github.com/shareed2k/go_limiter v0.0.5
 	golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 // indirect

go.sum

@@ -20,8 +20,6 @@ github.com/gomodule/redigo v1.7.1-0.20190322064113-39e2c31b7ca3 h1:6amM4HsNPOvML
 github.com/gomodule/redigo v1.7.1-0.20190322064113-39e2c31b7ca3/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
-github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

main.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/go-redis/redis/v7"
-	"github.com/imdario/mergo"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/shareed2k/go_limiter"
@@ -67,6 +66,10 @@ type (
 		// Default:
 		Prefix string
 
+		// SkipOnError
+		// Default: false
+		SkipOnError bool
+
 		// Period
 		Period time.Duration
 
@@ -81,6 +84,12 @@ type (
 		//   return ctx.String(defaultStatusCode, defaultMessage)
 		// }
 		Handler func(echo.Context) error
+
+		// ErrHandler is called when a error happen inside go_limiiter lib
+		// Default: func(c echo.Context) {
+		//   return ctx.String(defaultStatusCode, defaultMessage)
+		// }
+		ErrHandler func(error, echo.Context) error
 	}
 )
 
@@ -91,20 +100,58 @@ func New(rediser *redis.Client) echo.MiddlewareFunc {
 }
 
 func NewWithConfig(config Config) echo.MiddlewareFunc {
-	if err := mergo.Merge(&config, DefaultConfig); err != nil {
-		panic(err)
-	}
-
 	if config.Rediser == nil {
 		panic(errors.New("redis client is missing"))
 	}
 
+	if config.Skipper == nil {
+		config.Skipper = DefaultConfig.Skipper
+	}
+
+	if config.Max == 0 {
+		config.Max = DefaultConfig.Max
+	}
+
+	if config.Burst == 0 {
+		config.Burst = DefaultConfig.Burst
+	}
+
+	if config.StatusCode == 0 {
+		config.StatusCode = DefaultConfig.StatusCode
+	}
+
+	if config.Message == "" {
+		config.Message = DefaultConfig.Message
+	}
+
+	if config.Algorithm == "" {
+		config.Algorithm = DefaultConfig.Algorithm
+	}
+
+	if config.Prefix == "" {
+		config.Prefix = DefaultConfig.Prefix
+	}
+
+	if config.Period == 0 {
+		config.Period = DefaultConfig.Period
+	}
+
+	if config.Key == nil {
+		config.Key = DefaultConfig.Key
+	}
+
 	if config.Handler == nil {
 		config.Handler = func(ctx echo.Context) error {
 			return ctx.String(config.StatusCode, config.Message)
 		}
 	}
 
+	if config.ErrHandler == nil {
+		config.ErrHandler = func(err error, ctx echo.Context) error {
+			return echo.NewHTTPError(http.StatusInternalServerError, err)
+		}
+	}
+
 	limiter := go_limiter.NewLimiter(config.Rediser)
 	limit := &go_limiter.Limit{
 		Period:    config.Period,
@@ -123,21 +170,23 @@ func NewWithConfig(config Config) echo.MiddlewareFunc {
 			if err != nil {
 				ctx.Logger().Error(err)
 
-				return next(ctx)
+				if config.SkipOnError {
+					return next(ctx)
+				}
+
+				return config.ErrHandler(err, ctx)
 			}
 
 			res := ctx.Response()
 
 			// Check if hits exceed the max
 			if !result.Allowed {
-				// Call Handler func
-				err := config.Handler(ctx)
-
 				// Return response with Retry-After header
 				// https://tools.ietf.org/html/rfc6584
 				res.Header().Set("Retry-After", strconv.FormatInt(time.Now().Add(result.RetryAfter).Unix(), 10))
 
-				return err
+				// Call Handler func
+				return config.Handler(ctx)
 			}
 
 			// We can continue, update RateLimit headers