From f8c03173cbd7600d7dba5f0ff8fa6ef6ff272ea1 Mon Sep 17 00:00:00 2001 From: bronku Date: Fri, 28 Mar 2025 18:12:00 +0100 Subject: [PATCH] moved error page to logging --- internal/{server/errors.go => logging/error.go} | 4 ++-- internal/server/template.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename internal/{server/errors.go => logging/error.go} (66%) diff --git a/internal/server/errors.go b/internal/logging/error.go similarity index 66% rename from internal/server/errors.go rename to internal/logging/error.go index bc85170..48799e7 100644 --- a/internal/server/errors.go +++ b/internal/logging/error.go @@ -1,11 +1,11 @@ -package server +package logging import ( "fmt" "net/http" ) -func errorPage(err error, status int) http.HandlerFunc { +func ErrorPage(err error, status int) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(status) fmt.Fprint(w, err.Error()) diff --git a/internal/server/template.go b/internal/server/template.go index 210c2ce..e26a837 100644 --- a/internal/server/template.go +++ b/internal/server/template.go @@ -5,6 +5,8 @@ import ( "html/template" "log" "net/http" + + "github.com/Bronku/iroon/internal/logging" ) //go:embed templates/* @@ -23,12 +25,12 @@ func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc { w.Header().Set("content-type", "text/html") data, code, err := fetch(r) if err != nil { - errorPage(err, code).ServeHTTP(w, r) + logging.ErrorPage(err, code).ServeHTTP(w, r) return } err = s.tmpl.ExecuteTemplate(w, templateName, data) if err != nil { - errorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) + logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) } } }