Remove proxy status.sock

This commit is contained in:
Bryan Boreham committed 2017-05-13 16:31:16 +01:00
1 parent 6ba2bf80b8
commit bf3ecaf48a
3 files changed
+5 -28

No files matched your search

+4 -2
View File
@@ -258,9 +258,11 @@ func main() {
var waitReady common.WaitGroup
var proxy *weaveproxy.Proxy
var err error
if proxyConfig.Enabled {
// Start Weave Proxy:
proxy, err := weaveproxy.NewProxy(*proxyConfig)
proxy, err = weaveproxy.NewProxy(*proxyConfig)
if err != nil {
Log.Fatalf("Could not start proxy: %s", err)
}
@@ -268,7 +270,6 @@ func main() {
listeners := proxy.Listen()
proxy.AttachExistingContainers()
go proxy.Serve(listeners, waitReady.Add())
go proxy.ListenAndServeStatus("/home/weave/status.sock")
}
if pktdebug {
@@ -441,6 +442,7 @@ func main() {
HandleHTTP(muxRouter, version, router, allocator, defaultSubnet, ns, dnsserver, &waitReady)
HandleHTTPPeer(muxRouter, allocator, discoveryEndpoint, token, name.String())
muxRouter.Methods("GET").Path("/metrics").Handler(metricsHandler(router, allocator, ns, dnsserver))
muxRouter.Methods("GET").Path("/proxyaddrs").HandlerFunc(proxy.StatusHTTP)
http.Handle("/", common.LoggingHTTPHandler(muxRouter))
Log.Println("Listening for HTTP control messages on", httpAddr)
go listenAndServeHTTP(httpAddr, nil)