]> Sergey Matveev's repositories - btrtrc.git/commitdiff
util: LoggedHTTPServe uses its own mux for use as a HTTP status server
authorMatt Joiner <anacrolix@gmail.com>
Tue, 18 Nov 2014 20:35:32 +0000 (14:35 -0600)
committerMatt Joiner <anacrolix@gmail.com>
Tue, 18 Nov 2014 20:35:32 +0000 (14:35 -0600)
util/loghttp.go

index ce6f1ef534d8c68732249378295fb9c2236a2e1a..399750aad4d06f221c18a759095b0dbf9e1c45d4 100644 (file)
@@ -7,7 +7,7 @@ import (
        _ "net/http/pprof"
 )
 
-func LoggedHTTPServe(addr string) {
+func LoggedHTTPServe(addr string) *http.ServeMux {
        if addr == "" {
                addr = "localhost:6061"
        }
@@ -27,11 +27,15 @@ func LoggedHTTPServe(addr string) {
                log.Fatalf("error creating http conn: %#v", err)
        }
        log.Printf("starting http server on http://%s", conn.Addr())
+       mux := http.NewServeMux()
        go func() {
                defer conn.Close()
-               err = (&http.Server{}).Serve(conn)
+               err = (&http.Server{
+                       Handler: mux,
+               }).Serve(conn)
                if err != nil {
                        log.Fatalf("error serving http: %s", err)
                }
        }()
+       return mux
 }