sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: Rename responder to handler

Browse Source
This commit is contained in:
Adnan Maolood 2021-02-15 01:15:23 -05:00
parent 2c7f8273e9
commit 5a784693ef
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mux.go
View File

@ -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))
}

10
server.go
View File

@ -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
}