updated hws.ThrowError to not return an error and log it to console instead
fixed errors_test fixed tests
This commit is contained in:
@@ -5,35 +5,37 @@ import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
type Middleware func(h http.Handler) http.Handler
|
||||
type MiddlewareFunc func(w http.ResponseWriter, r *http.Request) (*http.Request, *HWSError)
|
||||
type (
|
||||
Middleware func(h http.Handler) http.Handler
|
||||
MiddlewareFunc func(w http.ResponseWriter, r *http.Request) (*http.Request, *HWSError)
|
||||
)
|
||||
|
||||
// Server.AddMiddleware registers all the middleware.
|
||||
// AddMiddleware registers all the middleware.
|
||||
// Middleware will be run in the order that they are provided.
|
||||
// Can only be called once
|
||||
func (server *Server) AddMiddleware(middleware ...Middleware) error {
|
||||
if !server.routes {
|
||||
func (s *Server) AddMiddleware(middleware ...Middleware) error {
|
||||
if !s.routes {
|
||||
return errors.New("Server.AddRoutes must be called before Server.AddMiddleware")
|
||||
}
|
||||
if server.middleware {
|
||||
if s.middleware {
|
||||
return errors.New("Server.AddMiddleware already called")
|
||||
}
|
||||
// RUN LOGGING MIDDLEWARE FIRST
|
||||
server.server.Handler = logging(server.server.Handler, server.logger)
|
||||
s.server.Handler = logging(s.server.Handler, s.logger)
|
||||
|
||||
// LOOP PROVIDED MIDDLEWARE IN REVERSE order
|
||||
for i := len(middleware); i > 0; i-- {
|
||||
server.server.Handler = middleware[i-1](server.server.Handler)
|
||||
s.server.Handler = middleware[i-1](s.server.Handler)
|
||||
}
|
||||
|
||||
// RUN GZIP
|
||||
if server.GZIP {
|
||||
server.server.Handler = addgzip(server.server.Handler)
|
||||
if s.GZIP {
|
||||
s.server.Handler = addgzip(s.server.Handler)
|
||||
}
|
||||
// RUN TIMER MIDDLEWARE LAST
|
||||
server.server.Handler = startTimer(server.server.Handler)
|
||||
s.server.Handler = startTimer(s.server.Handler)
|
||||
|
||||
server.middleware = true
|
||||
s.middleware = true
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -43,14 +45,14 @@ func (server *Server) AddMiddleware(middleware ...Middleware) error {
|
||||
// and returns a new request and optional HWSError.
|
||||
// If a HWSError is returned, server.ThrowError will be called.
|
||||
// If HWSError.RenderErrorPage is true, the request chain will be terminated and the error page rendered
|
||||
func (server *Server) NewMiddleware(
|
||||
func (s *Server) NewMiddleware(
|
||||
middlewareFunc MiddlewareFunc,
|
||||
) Middleware {
|
||||
return func(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
newReq, herr := middlewareFunc(w, r)
|
||||
if herr != nil {
|
||||
server.ThrowError(w, r, *herr)
|
||||
s.ThrowError(w, r, *herr)
|
||||
if herr.RenderErrorPage {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user