From 51c6b2aedf0e551a72c4effd22584f04113dd6c1 Mon Sep 17 00:00:00 2001
From: Simba Peng <1531315@qq.com>
Date: Fri, 7 Apr 2023 16:00:17 +0800
Subject: [PATCH] Check whether  is nil before invoking centralized error
 handling.

---
 middleware/recover.go        | 15 ++++++++-------
 middleware/request_logger.go |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/middleware/recover.go b/middleware/recover.go
index 36d41aa64..0466cfe56 100644
--- a/middleware/recover.go
+++ b/middleware/recover.go
@@ -37,6 +37,7 @@ type (
 
 		// LogErrorFunc defines a function for custom logging in the middleware.
 		// If it's set you don't need to provide LogLevel for config.
+		// If this function returns nil, the centralized HTTPErrorHandler will not be called.
 		LogErrorFunc LogErrorFunc
 
 		// DisableErrorHandler disables the call to centralized HTTPErrorHandler.
@@ -49,12 +50,12 @@ type (
 var (
 	// DefaultRecoverConfig is the default Recover middleware config.
 	DefaultRecoverConfig = RecoverConfig{
-		Skipper:           DefaultSkipper,
-		StackSize:         4 << 10, // 4 KB
-		DisableStackAll:   false,
-		DisablePrintStack: false,
-		LogLevel:          0,
-		LogErrorFunc:      nil,
+		Skipper:             DefaultSkipper,
+		StackSize:           4 << 10, // 4 KB
+		DisableStackAll:     false,
+		DisablePrintStack:   false,
+		LogLevel:            0,
+		LogErrorFunc:        nil,
 		DisableErrorHandler: false,
 	}
 )
@@ -120,7 +121,7 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 						}
 					}
 
-					if(!config.DisableErrorHandler) {
+					if err != nil && !config.DisableErrorHandler {
 						c.Error(err)
 					} else {
 						returnErr = err
diff --git a/middleware/request_logger.go b/middleware/request_logger.go
index b9e369255..8e312e8d8 100644
--- a/middleware/request_logger.go
+++ b/middleware/request_logger.go
@@ -257,7 +257,7 @@ func (config RequestLoggerConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
 				config.BeforeNextFunc(c)
 			}
 			err := next(c)
-			if config.HandleError {
+			if err != nil && config.HandleError {
 				c.Error(err)
 			}