From 06c53cc5b17334e7a6909fb49e1fe59cf1eac44c Mon Sep 17 00:00:00 2001 From: Adnan Maolood Date: Thu, 14 Jan 2021 22:12:07 -0500 Subject: [PATCH] server: Rename Register to Handle --- examples/auth.go | 2 +- examples/server.go | 2 +- examples/stream.go | 2 +- server.go | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/auth.go b/examples/auth.go index 228f975..aedf262 100644 --- a/examples/auth.go +++ b/examples/auth.go @@ -42,7 +42,7 @@ func main() { Duration: time.Hour, }) } - server.Register("localhost", &mux) + server.Handle("localhost", &mux) if err := server.ListenAndServe(); err != nil { log.Fatal(err) diff --git a/examples/server.go b/examples/server.go index 21b6da4..7ccd0e8 100644 --- a/examples/server.go +++ b/examples/server.go @@ -34,7 +34,7 @@ func main() { var mux gemini.ServeMux mux.Handle("/", gemini.FileServer(gemini.Dir("/var/www"))) - server.Register("localhost", &mux) + server.Handle("localhost", &mux) if err := server.ListenAndServe(); err != nil { log.Fatal(err) } diff --git a/examples/stream.go b/examples/stream.go index 522205c..74c78e5 100644 --- a/examples/stream.go +++ b/examples/stream.go @@ -31,7 +31,7 @@ func main() { }) } - server.RegisterFunc("localhost", stream) + server.HandleFunc("localhost", stream) if err := server.ListenAndServe(); err != nil { log.Fatal(err) } diff --git a/server.go b/server.go index 97f6ed3..b1f83af 100644 --- a/server.go +++ b/server.go @@ -46,12 +46,12 @@ type responderKey struct { hostname string } -// Register registers a responder for the given pattern. +// Handle registers a responder for the given pattern. // -// Patterns must be in the form of "hostname" or "scheme://hostname". +// The pattern must be in the form of "hostname" or "scheme://hostname". // If no scheme is specified, a scheme of "gemini://" is implied. // Wildcard patterns are supported (e.g. "*.example.com"). -func (s *Server) Register(pattern string, responder Responder) { +func (s *Server) Handle(pattern string, responder Responder) { if pattern == "" { panic("gemini: invalid pattern") } @@ -80,9 +80,9 @@ func (s *Server) Register(pattern string, responder Responder) { s.hosts[key.hostname] = true } -// RegisterFunc registers a responder function for the given pattern. -func (s *Server) RegisterFunc(pattern string, responder func(*ResponseWriter, *Request)) { - s.Register(pattern, ResponderFunc(responder)) +// HandleFunc registers a responder function for the given pattern. +func (s *Server) HandleFunc(pattern string, responder func(*ResponseWriter, *Request)) { + s.Handle(pattern, ResponderFunc(responder)) } // ListenAndServe listens for requests at the server's configured address.