fix: lazy error handling

diff --git a/pkg/routes/404.go b/pkg/routes/404.go
index f7e0c93a934cab096f14430b632f5fc45c738e5c..00c1407d44d869f8bdb2ec68358226103213da03 100644 (file)
--- a/pkg/routes/404.go
+++ b/pkg/routes/404.go
@@ -1,6 +1,7 @@
 package routes
 
 import (
+       "fmt"
        "html/template"
        "log"
        "net/http"
@@ -10,7 +11,8 @@ func NotFound(templ *template.Template) http.HandlerFunc {
        return func(w http.ResponseWriter, _ *http.Request) {
                err := templ.ExecuteTemplate(w, "404.html", "")
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       fmt.Fprintf(w, "505 Internal Server Error")
                }
        }
 }

diff --git a/pkg/routes/blog-post.go b/pkg/routes/blog-post.go
index d1fd415c91dec60c2ddef81f884a19d231ee487d..26108483be567615d38b92accceca0823263bcf7 100644 (file)
--- a/pkg/routes/blog-post.go
+++ b/pkg/routes/blog-post.go
@@ -28,7 +28,9 @@ func BlogPost(templ *template.Template, posts []*blog.BlogPost) http.HandlerFunc
 
                err := templ.ExecuteTemplate(w, "blog-page.html", post)
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       http.Redirect(w, r, "/404", http.StatusSeeOther)
+                       return
                }
        }
 }

diff --git a/pkg/routes/blog.go b/pkg/routes/blog.go
index e93198aa24320477135e3371a0f8df2f4346587e..34b7251ae72e5de401203b898fc862599b412b06 100644 (file)
--- a/pkg/routes/blog.go
+++ b/pkg/routes/blog.go
@@ -9,10 +9,12 @@ import (
 )
 
 func Blog(templ *template.Template, posts []*blog.BlogPost) http.HandlerFunc {
-       return func(w http.ResponseWriter, _ *http.Request) {
+       return func(w http.ResponseWriter, r *http.Request) {
                err := templ.ExecuteTemplate(w, "blog.html", posts)
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       http.Redirect(w, r, "/404", http.StatusSeeOther)
+                       return
                }
        }
 }

diff --git a/pkg/routes/index.go b/pkg/routes/index.go
index cd6ca590af3e6c2abd44a5519805aab6ab77e298..ec98df47d0d0cce701924cb266cf16b0184bff15 100644 (file)
--- a/pkg/routes/index.go
+++ b/pkg/routes/index.go
@@ -7,10 +7,12 @@ import (
 )
 
 func Index(templ *template.Template) http.HandlerFunc {
-       return func(w http.ResponseWriter, _ *http.Request) {
+       return func(w http.ResponseWriter, r *http.Request) {
                err := templ.ExecuteTemplate(w, "index.html", "")
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       http.Redirect(w, r, "/404", http.StatusSeeOther)
+                       return
                }
        }
 }

diff --git a/pkg/routes/nothing-to-see.go b/pkg/routes/nothing-to-see.go
index 94ec3c3c55ed8359ecacad7a78b8a9f64e12f19d..064d75913860ca3447d9ccda53cffa8dc4a3de75 100644 (file)
--- a/pkg/routes/nothing-to-see.go
+++ b/pkg/routes/nothing-to-see.go
@@ -7,10 +7,12 @@ import (
 )
 
 func NothingToSee(templ *template.Template) http.HandlerFunc {
-       return func(w http.ResponseWriter, _ *http.Request) {
+       return func(w http.ResponseWriter, r *http.Request) {
                err := templ.ExecuteTemplate(w, "nothing-to-see.html", "")
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       http.Redirect(w, r, "/404", http.StatusSeeOther)
+                       return
                }
        }
 }

diff --git a/pkg/routes/projects.go b/pkg/routes/projects.go
index a97f2ffad559e7420dc2526afb70a63ce2d09373..3f7b0e5798fca4bead317d05f411514b9c676fc6 100644 (file)
--- a/pkg/routes/projects.go
+++ b/pkg/routes/projects.go
@@ -7,10 +7,12 @@ import (
 )
 
 func Projects(templ *template.Template) http.HandlerFunc {
-       return func(w http.ResponseWriter, _ *http.Request) {
+       return func(w http.ResponseWriter, r *http.Request) {
                err := templ.ExecuteTemplate(w, "projects.html", "")
                if err != nil {
-                       log.Fatal(err)
+                       log.Print(err)
+                       http.Redirect(w, r, "/404", http.StatusSeeOther)
+                       return
                }
        }
 }

diff --git a/static/templates/404.html b/static/templates/404.html
index 95a6548613a9ca304dd51292dcee1c016f15f944..830b200cc29ffb6878cfd37fcb9b76a47df5a07b 100644 (file)
--- a/static/templates/404.html
+++ b/static/templates/404.html
@@ -22,6 +22,7 @@
             <br />
             <div class="terminal-line">I think you're a little lost, ay?</div>
             <div class="terminal-line">(or maybe I forgot smth, sorry)</div>
+            <div class="terminal-line">(or maybe this is just an error, never cared to build an actual error page, sorry)</div>
             <br />
             <div class="terminal-line">Either way, turn back, pal!</div>
             <div class="terminal-line">It's not too late!</div>