h/golib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated hws: expanded error page functionality

Browse Source
This commit is contained in:
Haelnorr
2026-01-23 12:33:13 +11:00
parent e9b96fedb1
commit 378bd8006d
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hws/errors.go
View File

@@ -31,7 +31,7 @@ const (
// ErrorPageFunc is a function that returns an ErrorPage with the specified HTTP Status code // ErrorPageFunc is a function that returns an ErrorPage with the specified HTTP Status code
// This will be called by the server when it needs to render an error page // This will be called by the server when it needs to render an error page
type ErrorPageFunc func(errorCode int) (ErrorPage, error) type ErrorPageFunc func(error HWSError) (ErrorPage, error)
// ErrorPage must implement a Render() function that takes in a context and ResponseWriter, // ErrorPage must implement a Render() function that takes in a context and ResponseWriter,
// and should write a reponse as output to the ResponseWriter. // and should write a reponse as output to the ResponseWriter.
@@ -40,11 +40,11 @@ type ErrorPage interface {
Render(ctx context.Context, w io.Writer) error Render(ctx context.Context, w io.Writer) error
} }
// TODO: add test for ErrorPageFunc that returns an error // AddErrorPage registers a handler that returns an ErrorPage
func (server *Server) AddErrorPage(pageFunc ErrorPageFunc) error { func (server *Server) AddErrorPage(pageFunc ErrorPageFunc) error {
rr := httptest.NewRecorder() rr := httptest.NewRecorder()
req := httptest.NewRequest("GET", "/", nil) req := httptest.NewRequest("GET", "/", nil)
page, err := pageFunc(http.StatusInternalServerError) page, err := pageFunc(HWSError{StatusCode: http.StatusInternalServerError})
if err != nil { if err != nil {
return errors.Wrap(err, "An error occured when trying to get the error page") return errors.Wrap(err, "An error occured when trying to get the error page")
} }
@@ -88,7 +88,7 @@ func (server *Server) ThrowError(w http.ResponseWriter, r *http.Request, error H
} }
if error.RenderErrorPage { if error.RenderErrorPage {
server.LogError(HWSError{Message: "Error page rendering", Error: nil, Level: ErrorDEBUG}) server.LogError(HWSError{Message: "Error page rendering", Error: nil, Level: ErrorDEBUG})
errPage, err := server.errorPage(error.StatusCode) errPage, err := server.errorPage(error)
if err != nil { if err != nil {
server.LogError(HWSError{Message: "Failed to get a valid error page", Error: err}) server.LogError(HWSError{Message: "Failed to get a valid error page", Error: err})
} }

6
hws/errors_test.go
View File

@@ -17,13 +17,13 @@ import (
type goodPage struct{} type goodPage struct{}
type badPage struct{} type badPage struct{}
func goodRender(code int) (hws.ErrorPage, error) { func goodRender(error hws.HWSError) (hws.ErrorPage, error) {
return goodPage{}, nil return goodPage{}, nil
} }
func badRender1(code int) (hws.ErrorPage, error) { func badRender1(error hws.HWSError) (hws.ErrorPage, error) {
return badPage{}, nil return badPage{}, nil
} }
func badRender2(code int) (hws.ErrorPage, error) { func badRender2(error hws.HWSError) (hws.ErrorPage, error) {
return nil, errors.New("I'm an error") return nil, errors.New("I'm an error")
} }

6
hws/server_methods_test.go
View File

@@ -149,7 +149,8 @@ func Test_Start_Errors(t *testing.T) {
}) })
require.NoError(t, err) require.NoError(t, err)
err = server.Start(t.Context()) var nilCtx context.Context = nil
err = server.Start(nilCtx)
assert.Error(t, err) assert.Error(t, err)
assert.Contains(t, err.Error(), "Context cannot be nil") assert.Contains(t, err.Error(), "Context cannot be nil")
}) })
@@ -163,7 +164,8 @@ func Test_Shutdown_Errors(t *testing.T) {
startTestServer(t, server) startTestServer(t, server)
<-server.Ready() <-server.Ready()
err := server.Shutdown(t.Context()) var nilCtx context.Context = nil
err := server.Shutdown(nilCtx)
assert.Error(t, err) assert.Error(t, err)
assert.Contains(t, err.Error(), "Context cannot be nil") assert.Contains(t, err.Error(), "Context cannot be nil")