Merge pull request #1941 from weaveworks/issues/1873-check-running-master

Improve visibility of startup problems

Fixes #1873.
This commit is contained in:
Matthias Radestock committed 2016-02-04 16:50:50 +00:00
commit 98d76e1099
4 files changed
+49 -26

No files matched your search

+2 -4
View File
@@ -19,6 +19,7 @@ import (
weaveapi "github.com/weaveworks/weave/api"
. "github.com/weaveworks/weave/common"
weavedocker "github.com/weaveworks/weave/common/docker"
weavenet "github.com/weaveworks/weave/net"
)
const (
@@ -297,10 +298,7 @@ func (proxy *Proxy) Serve(listeners []net.Listener) {
}
func (proxy *Proxy) ListenAndServeStatus(socket string) {
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
Log.Fatalf("Error removing existing status socket: %s", err)
}
listener, err := net.Listen("unix", socket)
listener, err := weavenet.ListenUnixSocket(socket)
if err != nil {
Log.Fatalf("ListenAndServeStatus failed: %s", err)
}