aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdnan Maolood <[email protected]>2021-02-15 01:15:23 -0500
committerAdnan Maolood <[email protected]>2021-02-15 01:15:23 -0500
commit5a784693ef8b4b814c6f3d0c2eb2dace5523b1f9 (patch)
tree5705f491626b6785e11d43995985cfe7bbcafcf9
parentserver: Recover from ServeGemini panics (diff)
downloadgo-gemini-5a784693ef8b4b814c6f3d0c2eb2dace5523b1f9.tar.xz
go-gemini-5a784693ef8b4b814c6f3d0c2eb2dace5523b1f9.zip
server: Rename responder to handler
-rw-r--r--mux.go4
-rw-r--r--server.go10
2 files changed, 7 insertions, 7 deletions
diff --git a/mux.go b/mux.go
index 7fd4113..80ddaa6 100644
--- a/mux.go
+++ b/mux.go
@@ -170,7 +170,7 @@ func (mux *ServeMux) Handle(pattern string, handler Handler) {
panic("gemini: invalid pattern")
}
if handler == nil {
- panic("gemini: nil responder")
+ panic("gemini: nil handler")
}
if _, exist := mux.m[pattern]; exist {
panic("gemini: multiple registrations for " + pattern)
@@ -204,7 +204,7 @@ func appendSorted(es []muxEntry, e muxEntry) []muxEntry {
// HandleFunc registers the handler function for the given pattern.
func (mux *ServeMux) HandleFunc(pattern string, handler func(ResponseWriter, *Request)) {
if handler == nil {
- panic("gemini: nil responder")
+ panic("gemini: nil handler")
}
mux.Handle(pattern, HandlerFunc(handler))
}
diff --git a/server.go b/server.go
index 38040f4..2e0c65e 100644
--- a/server.go
+++ b/server.go
@@ -78,7 +78,7 @@ func (srv *Server) Handle(pattern string, handler Handler) {
panic("gemini: invalid pattern")
}
if handler == nil {
- panic("gemini: nil responder")
+ panic("gemini: nil handler")
}
if srv.handlers == nil {
srv.handlers = map[handlerKey]Handler{}
@@ -386,18 +386,18 @@ func (srv *Server) respond(conn net.Conn) {
// Store remote address
req.RemoteAddr = conn.RemoteAddr()
- resp := srv.responder(req)
- if resp == nil {
+ h := srv.handler(req)
+ if h == nil {
w.Status(StatusNotFound)
w.Flush()
return
}
- resp.ServeGemini(w, req)
+ h.ServeGemini(w, req)
w.Flush()
}
-func (srv *Server) responder(r *Request) Handler {
+func (srv *Server) handler(r *Request) Handler {
if h, ok := srv.handlers[handlerKey{r.URL.Scheme, r.URL.Hostname()}]; ok {
return h
}