improoved error handling

Kirari04 · Jan 18, 2024 · f6025b2 · f6025b2
1 parent 6554dda
commit f6025b2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/controllers/PlayerController.go b/controllers/PlayerController.go
@@ -24,7 +24,10 @@ func PlayerController(c echo.Context) error {
 	}
 	var requestValidation Request
 	if status, err := helpers.Validate(c, &requestValidation); err != nil {
-		return c.String(status, err.Error())
+		return c.Render(status, "error.html", echo.Map{
+			"Title": "Player Error",
+			"Error": err.Error(),
+		})
 	}
 
 	//check if requested folder exists

diff --git a/inits/Server.go b/inits/Server.go
@@ -75,16 +75,17 @@ func Server() {
 
 	app.IPExtractor = echo.ExtractIPFromXFFHeader(trustOptions...)
 	app.HTTPErrorHandler = func(err error, c echo.Context) {
-		// Status code defaults to 500
 		code := http.StatusInternalServerError
-
-		// Retrieve the custom status code if it's a *echo.HTTPError
 		if he, ok := err.(*echo.HTTPError); ok {
 			code = he.Code
 		}
-
-		if code == http.StatusInternalServerError {
-			c.Logger().Error(err)
+		c.Logger().Error(err)
+		if code == 404 {
+			if err := c.Render(code, "404.html", echo.Map{}); err != nil {
+				c.Logger().Error(err)
+			}
+		} else {
+			c.NoContent(code)
 		}
 	}
 

diff --git a/views/404.html b/views/404.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>Not Found</title>
 </head>
-<body>
+
+<body style="background-color: black;color: white;">
     <h1>Not Found</h1>
 </body>
+
 </html>
diff --git a/views/error.html b/views/error.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{.Title}}</title>
+</head>
+
+<body style="background-color: black;color: white;">
+    <h1>{{.Title}}</h1>
+    <p>
+        {{.Error}}
+    </p>
+</body>
+
+</html>