From 087a3339477aa2fb797aa9b87661ebcb348cc65c Mon Sep 17 00:00:00 2001 From: Andrew Gerhold Date: Sun, 29 Nov 2020 19:13:07 -0800 Subject: [PATCH] Update handlers.go to add DownText --- handlers/handlers.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/handlers/handlers.go b/handlers/handlers.go index 5da8ffec..b9fd596d 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -213,17 +213,6 @@ func returnJson(d interface{}, w http.ResponseWriter, r *http.Request) { } func returnResponseCode(s *Service, w http.ResponseWriter, r *http.Request) { - if e, ok := d.(errors.Error); ok { - w.WriteHeader(e.Status()) - json.NewEncoder(w).Encode(e) - return - } - if e, ok := d.(error); ok { - w.WriteHeader(500) - json.NewEncoder(w).Encode(errors.New(e.Error())) - return - } - // Go does not currently // support sending user-defined 1xx informational headers, // with the exception of 100-continue response header that the @@ -231,8 +220,12 @@ func returnResponseCode(s *Service, w http.ResponseWriter, r *http.Request) { // https://golang.org/src/net/http/server.go?s=3003:5866#L150 if LastStatusCode >= 100 { w.WriteHeader(s.LastStatusCode) + w.Write([]byte(s.DownText)) + return } - return w.WriteHeader(http.StatusTeapot) + + w.WriteHeader(http.StatusTeapot) + w.Write([]byte("☄ Last Status Code Not Set!")) } // error404Handler is a HTTP handler for 404 error pages