go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-02-02 15:30:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor edits

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos 2022-10-05 03:10:27 +03:00
parent 211834a0d7
commit 758feb2e50
No known key found for this signature in database
GPG Key ID: 403EEB7885C79503
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/router/router.go
View File

@ -97,6 +97,14 @@ func (router *Router) FindClosestPaths(subdomain, searchPath string, n int) []st
return list return list
} }
func (router *Router) buildMainHandler(cPool *context.Pool, requestHandler RequestHandler) {
router.mainHandler = func(w http.ResponseWriter, r *http.Request) {
ctx := cPool.Acquire(w, r)
router.requestHandler.HandleRequest(ctx)
cPool.Release(ctx)
}
}
func (router *Router) buildMainHandlerWithFilters(routerFilters map[Party]*Filter, cPool *context.Pool, requestHandler RequestHandler) { func (router *Router) buildMainHandlerWithFilters(routerFilters map[Party]*Filter, cPool *context.Pool, requestHandler RequestHandler) {
sortedFilters := make([]*Filter, 0, len(routerFilters)) sortedFilters := make([]*Filter, 0, len(routerFilters))
// key was just there to enforce uniqueness on API level. // key was just there to enforce uniqueness on API level.
@ -215,11 +223,7 @@ func (router *Router) BuildRouter(cPool *context.Pool, requestHandler RequestHan
if routerFilters := routesProvider.GetRouterFilters(); len(routerFilters) > 0 { if routerFilters := routesProvider.GetRouterFilters(); len(routerFilters) > 0 {
router.buildMainHandlerWithFilters(routerFilters, cPool, requestHandler) router.buildMainHandlerWithFilters(routerFilters, cPool, requestHandler)
} else { } else {
router.mainHandler = func(w http.ResponseWriter, r *http.Request) { router.buildMainHandler(cPool, requestHandler)
ctx := cPool.Acquire(w, r)
router.requestHandler.HandleRequest(ctx)
cPool.Release(ctx)
}
} }
for i := len(router.wrapperFuncs) - 1; i >= 0; i-- { for i := len(router.wrapperFuncs) - 1; i >= 0; i-- {

11
iris.go
View File

@ -665,7 +665,7 @@ func (app *Application) Build() error {
if cb := app.OnBuild; cb != nil { if cb := app.OnBuild; cb != nil {
if err := cb(); err != nil { if err := cb(); err != nil {
return err return fmt.Errorf("build: %w", err)
} }
} }
@ -721,16 +721,14 @@ func (app *Application) Build() error {
app.view.AddFunc("urlpath", rv.Path) app.view.AddFunc("urlpath", rv.Path)
// app.view.AddFunc("url", rv.URL) // app.view.AddFunc("url", rv.URL)
if err := app.view.Load(); err != nil { if err := app.view.Load(); err != nil {
app.logger.Errorf("View Builder: %v", err) return fmt.Errorf("build: view engine: %v", err)
return err
} }
} }
if !app.Router.Downgraded() { if !app.Router.Downgraded() {
// router // router
if _, err := injectLiveReload(app); err != nil { if _, err := injectLiveReload(app); err != nil {
app.logger.Errorf("LiveReload: init: failed: %v", err) return fmt.Errorf("build: inject live reload: failed: %v", err)
return err
} }
if app.config.ForceLowercaseRouting { if app.config.ForceLowercaseRouting {
@ -747,8 +745,7 @@ func (app *Application) Build() error {
routerHandler := router.NewDefaultHandler(app.config, app.logger) routerHandler := router.NewDefaultHandler(app.config, app.logger)
err := app.Router.BuildRouter(app.ContextPool, routerHandler, app.APIBuilder, false) err := app.Router.BuildRouter(app.ContextPool, routerHandler, app.APIBuilder, false)
if err != nil { if err != nil {
app.logger.Error(err) return fmt.Errorf("build: router: %w", err)
return err
} }
app.HTTPErrorHandler = routerHandler app.HTTPErrorHandler = routerHandler