From db049e3b672f33645eefe733939339a3460a3e93 Mon Sep 17 00:00:00 2001 From: sneak Date: Wed, 30 Sep 2020 22:24:52 -0700 Subject: [PATCH] fixes --- httpserver/handlepanic.go | 2 -- httpserver/routes.go | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/httpserver/handlepanic.go b/httpserver/handlepanic.go index 19c5975..ddbe0bc 100644 --- a/httpserver/handlepanic.go +++ b/httpserver/handlepanic.go @@ -1,7 +1,6 @@ package httpserver import ( - "fmt" "net/http" ) @@ -11,6 +10,5 @@ import ( func (s *server) handlePanic() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { panic("y tho") - fmt.Fprintf(w, "hello world") } } diff --git a/httpserver/routes.go b/httpserver/routes.go index 395e7d9..26fa9d0 100644 --- a/httpserver/routes.go +++ b/httpserver/routes.go @@ -16,20 +16,20 @@ func (s *server) routes() { // wrapper) on a specific HandleFunc route, you need to take the // .ServeHTTP of the http.Handler to get its HandleFunc, viz: s.router.HandleFunc( - "/login", - authMiddleware(s.handleLogin()).ServeHTTP + "/login", + authMiddleware(s.handleLogin()).ServeHTTP, ).Methods("GET") s.router.HandleFunc( - "/.well-known/healthcheck.json", - s.handleHealthCheck(), + "/.well-known/healthcheck.json", + s.handleHealthCheck(), ).Methods("GET") // route that panics for testing // CHANGEME remove this s.router.HandleFunc( - "/panic", - s.handlePanic() + "/panic", + s.handlePanic(), ).Methods("GET") // the Gorilla mux .Use() takes a http.Handler wrapper func, like