devbennett7/goma-gateway
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #101 from jkaninda/refactor

Browse Source 
chore: disable calling error interceptor when size is 0
This commit is contained in:
Jonas Kaninda
2024-11-14 21:24:03 +01:00
committed by GitHub
parent ffaf010878 2d829e5a5d
commit d179a63bd0
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/route.go
View File

@@ -266,11 +266,13 @@ func (gatewayServer GatewayServer) Initialize() *mux.Router {
router.Use(pr.prometheusMiddleware) router.Use(pr.prometheusMiddleware)
} }
// Apply route Error interceptor middleware // Apply route Error interceptor middleware
interceptErrors := middleware.InterceptErrors{ if len(route.InterceptErrors) != 0 {
Origins: route.Cors.Origins, interceptErrors := middleware.InterceptErrors{
Errors: route.InterceptErrors, Origins: route.Cors.Origins,
Errors: route.InterceptErrors,
}
router.Use(interceptErrors.ErrorInterceptor)
} }
router.Use(interceptErrors.ErrorInterceptor)
} else { } else {
logger.Error("Error, path is empty in route %s", route.Name) logger.Error("Error, path is empty in route %s", route.Name)
logger.Error("Route path ignored: %s", route.Path) logger.Error("Route path ignored: %s", route.Path)
@@ -279,11 +281,14 @@ func (gatewayServer GatewayServer) Initialize() *mux.Router {
// Apply global Cors middlewares // Apply global Cors middlewares
r.Use(CORSHandler(gateway.Cors)) // Apply CORS middleware r.Use(CORSHandler(gateway.Cors)) // Apply CORS middleware
// Apply errorInterceptor middleware // Apply errorInterceptor middleware
interceptErrors := middleware.InterceptErrors{ if len(gateway.InterceptErrors) != 0 {
Errors: gateway.InterceptErrors, interceptErrors := middleware.InterceptErrors{
Origins: gateway.Cors.Origins, Errors: gateway.InterceptErrors,
Origins: gateway.Cors.Origins,
}
r.Use(interceptErrors.ErrorInterceptor)
} }
r.Use(interceptErrors.ErrorInterceptor)
return r return r
} }