simplify code

cmd/serve/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"log"
+	"net/http"
 
 	"github.com/go-rod/bartender"
 )
@@ -19,5 +20,8 @@ func main() {
 
 	log.Printf("Bartender started %s -> %s\n", *port, *target)
 
-	bartender.New(*port, *target).Serve()
+	err := http.ListenAndServe(*port, bartender.New(*port, *target))
+	if err != nil {
+		log.Fatalln(err)
+	}
 }

service.go

@@ -32,16 +32,7 @@ func New(addr, target string) *Bartender {
 	}
 }
 
-func (b *Bartender) Serve() {
-	http.HandleFunc("/", b.Handler)
-
-	err := http.ListenAndServe(b.addr, nil)
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (b *Bartender) Handler(w http.ResponseWriter, r *http.Request) {
+func (b *Bartender) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method == http.MethodGet && r.Header.Get("Accept-Language") == "" {
 		b.RenderPage(w, r)
 

service_test.go

@@ -24,7 +24,7 @@ func TestBasic(t *testing.T) {
 
 	bt := bartender.New("", website.URL())
 
-	proxy.Mux.HandleFunc("/", bt.Handler)
+	proxy.Mux.HandleFunc("/", bt.ServeHTTP)
 
 	{
 		res := g.Req("", proxy.URL("/test?q=ok"), http.Header{"Accept-Language": []string{"en"}})