tookeyman/vinegar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enabled more robust logging during errors

Browse Source
This commit is contained in:
dtookey 2022-08-15 13:45:30 -04:00
parent a438590f92
commit 3ed33dfac9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servlet/server.go
View File

@ -72,7 +72,7 @@ func (s *VinegarServlet) ServeHTTP(w http.ResponseWriter, req *http.Request) {
return return
} }
} }
s.SendError(w, 404, "Couldn't find your content.") s.SendError(w, req, 404, "Couldn't find your content.")
} }
func (s *VinegarServlet) Start() { func (s *VinegarServlet) Start() {
@ -95,8 +95,8 @@ func (r *VinegarRoute) Announce() {
log.Printf("Added route for [%s]\n", r.Pattern.String()) log.Printf("Added route for [%s]\n", r.Pattern.String())
} }
func (s *VinegarServlet) SendError(w http.ResponseWriter, code int, msg string) { func (s *VinegarServlet) SendError(w http.ResponseWriter, req *http.Request, code int, msg string) {
fmt.Printf("Reached SendError. Rendering template for code %d with message: %s\n", code, msg) fmt.Printf("[%d][%s]. Rendering template for code %d with message: %s\n", code, req.URL.Path, code, msg)
tmpl, exists := s.ErrorRoutes[code] tmpl, exists := s.ErrorRoutes[code]
if exists { if exists {
tmpl.TemplateManager.AddMixin("code", strconv.Itoa(code)) tmpl.TemplateManager.AddMixin("code", strconv.Itoa(code))

6
servlet/staticRoute.go
View File

@ -73,7 +73,7 @@ func createSingleFileServletFunction(route *FileRoute) VinegarHandlerFunction {
} }
if !exists { if !exists {
route.srv.SendError(w, 404, "File not found.") route.srv.SendError(w, req, 404, "File not found.")
return return
} }
@ -114,7 +114,7 @@ func createCompressibleFileServletFunction(route *FileRoute, basePattern string,
return return
} }
} else { } else {
route.srv.SendError(w, 404, "Couldn't find your content.") route.srv.SendError(w, req, 404, "Couldn't find your content.")
return return
} }
} }
@ -154,7 +154,7 @@ func createUncompressedFileServletFunction(route *FileRoute, basePattern string,
return return
} else { } else {
route.srv.SendError(w, 404, "Couldn't find your content.") route.srv.SendError(w, req, 404, "Couldn't find your content.")
} }
} }
return fun return fun