Compare commits

..

No commits in common. "fd61f14365b18ee027d820f09a4ea96d215fb2ce" and "e2a686fb659d1f6c38408c366f1c9a377c4333e3" have entirely different histories.

View File

@ -1,6 +1,7 @@
package servlet package servlet
import ( import (
"errors"
"fmt" "fmt"
"geniuscartel.xyz/vinegar/vinegarUtil" "geniuscartel.xyz/vinegar/vinegarUtil"
"log" "log"
@ -102,22 +103,11 @@ func (s *VinegarServlet) SendError(w http.ResponseWriter, req *http.Request, cod
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)
_, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code))))
if err != nil {
panic(err)
}
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
} }
w.WriteHeader(code)
_, err := w.Write([]byte(tmpl.TemplateManager.RenderTemplate(fmt.Sprintf("%d.html", code))))
if err != nil {
panic(err)
}
return
} }