Implement http.Handler in server.Dispatch

This commit is contained in:
Ken-Håvard Lieng 2018-11-09 07:32:47 +01:00
parent 4b4b2394a9
commit 04852cdf58

View File

@ -119,7 +119,7 @@ func (d *Dispatch) startHTTP() {
server := &http.Server{ server := &http.Server{
Addr: net.JoinHostPort(addr, portHTTPS), Addr: net.JoinHostPort(addr, portHTTPS),
Handler: http.HandlerFunc(d.serve), Handler: d,
} }
if certExists() { if certExists() {
@ -156,11 +156,11 @@ func (d *Dispatch) startHTTP() {
port = "1337" port = "1337"
} }
log.Println("[HTTP] Listening on port", port) log.Println("[HTTP] Listening on port", port)
log.Fatal(http.ListenAndServe(net.JoinHostPort(addr, port), http.HandlerFunc(d.serve))) log.Fatal(http.ListenAndServe(net.JoinHostPort(addr, port), d))
} }
} }
func (d *Dispatch) serve(w http.ResponseWriter, r *http.Request) { func (d *Dispatch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
fail(w, http.StatusNotFound) fail(w, http.StatusNotFound)
return return