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

edited SendError to ship a generic error if there's no template explicitly stated

Browse Source
This commit is contained in:
dtookey 2022-11-16 11:10:58 -05:00
parent 577525ebaf
commit 25ef4fd54b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servlet/server.go
View File

@ -1,6 +1,7 @@
package servlet package servlet
import ( import (
"encoding/json"
"fmt" "fmt"
"geniuscartel.xyz/vinegar/vinegarUtil" "geniuscartel.xyz/vinegar/vinegarUtil"
"log" "log"
@ -101,11 +102,22 @@ func (s *VinegarServlet) SendError(w http.ResponseWriter, code int, msg string)
if exists { if exists {
tmpl.TemplateManager.AddMixin("code", strconv.Itoa(code)) tmpl.TemplateManager.AddMixin("code", strconv.Itoa(code))
tmpl.TemplateManager.AddMixin("msg", msg) tmpl.TemplateManager.AddMixin("msg", msg)
}
w.WriteHeader(code) w.WriteHeader(code)
_, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code)))) _, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code))))
if err != nil { if err != nil {
panic(err) panic(err)
} }
return return
} else {
w.WriteHeader(code)
genericError, sErr := json.Marshal(msg)
if sErr != nil {
panic(sErr)
}
_, err := w.Write(genericError)
if err != nil {
panic(err)
}
return
}
} }