Move status HTTP handlers into prog/weaver/http.go
This commit is contained in:
1 parent
278807a199
commit
00ecff09f7
3 files changed
+46
-22
No files matched your search
@@ -0,0 +1,44 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/weaveworks/weave/ipam"
|
||||
"github.com/weaveworks/weave/nameserver"
|
||||
"github.com/weaveworks/weave/net/address"
|
||||
weave "github.com/weaveworks/weave/router"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func HandleHTTP(muxRouter *mux.Router,
|
||||
router *weave.Router,
|
||||
allocator *ipam.Allocator,
|
||||
defaultSubnet address.CIDR,
|
||||
ns *nameserver.Nameserver,
|
||||
dnsserver *nameserver.DNSServer) {
|
||||
|
||||
muxRouter.Methods("GET").Path("/status").Headers("Accept", "application/json").HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
json, _ := router.StatusJSON(version)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write(json)
|
||||
})
|
||||
|
||||
muxRouter.Methods("GET").Path("/status").HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
fmt.Fprintln(w, "weave router", version)
|
||||
fmt.Fprintln(w, router.Status())
|
||||
if allocator != nil {
|
||||
fmt.Fprintln(w, allocator.String())
|
||||
fmt.Fprintln(w, "Allocator default subnet:", defaultSubnet)
|
||||
}
|
||||
fmt.Fprintln(w, "")
|
||||
if dnsserver == nil {
|
||||
fmt.Fprintln(w, "WeaveDNS is disabled")
|
||||
} else {
|
||||
fmt.Fprintln(w, dnsserver.String())
|
||||
fmt.Fprintln(w, ns.String())
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
+1
-21
@@ -317,27 +317,7 @@ func handleHTTP(router *weave.Router, httpAddr string, allocator *ipam.Allocator
|
||||
|
||||
router.HandleHTTP(muxRouter)
|
||||
|
||||
muxRouter.Methods("GET").Path("/status").Headers("Accept", "application/json").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
json, _ := router.StatusJSON(version)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write(json)
|
||||
})
|
||||
|
||||
muxRouter.Methods("GET").Path("/status").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
fmt.Fprintln(w, "weave router", version)
|
||||
fmt.Fprintln(w, router.Status())
|
||||
if allocator != nil {
|
||||
fmt.Fprintln(w, allocator.String())
|
||||
fmt.Fprintln(w, "Allocator default subnet:", defaultSubnet)
|
||||
}
|
||||
fmt.Fprintln(w, "")
|
||||
if dnsserver == nil {
|
||||
fmt.Fprintln(w, "WeaveDNS is disabled")
|
||||
} else {
|
||||
fmt.Fprintln(w, dnsserver.String())
|
||||
fmt.Fprintln(w, ns.String())
|
||||
}
|
||||
})
|
||||
HandleHTTP(muxRouter, router, allocator, defaultSubnet, ns, dnsserver)
|
||||
|
||||
http.Handle("/", muxRouter)
|
||||
|
||||
|
||||
Reference in new issue
Block a user