diff options
| -rw-r--r-- | docker/local-registry-compose.yml | 4 | ||||
| -rw-r--r-- | weed/server/master_server.go | 6 | ||||
| -rw-r--r-- | weed/util/network.go | 22 |
3 files changed, 19 insertions, 13 deletions
diff --git a/docker/local-registry-compose.yml b/docker/local-registry-compose.yml index da86b4d74..7f3672cd0 100644 --- a/docker/local-registry-compose.yml +++ b/docker/local-registry-compose.yml @@ -13,10 +13,6 @@ services: - 8080:8080 - 18080:18080 command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" - volumes: - - type: bind - source: /Volumes/mobile_disk/data - target: /data depends_on: - master filer: diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 24a5d61b1..9404081b4 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -108,10 +108,10 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste ms.guard = security.NewGuard(ms.option.WhiteList, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec) + handleStaticResources2(r) + r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) + r.HandleFunc("/ui/index.html", ms.uiStatusHandler) if !ms.option.DisableHttp { - handleStaticResources2(r) - r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) - r.HandleFunc("/ui/index.html", ms.uiStatusHandler) r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler))) r.HandleFunc("/dir/lookup", ms.guard.WhiteList(ms.dirLookupHandler)) r.HandleFunc("/dir/status", ms.proxyToLeader(ms.guard.WhiteList(ms.dirStatusHandler))) diff --git a/weed/util/network.go b/weed/util/network.go index 7108cfea6..55a123667 100644 --- a/weed/util/network.go +++ b/weed/util/network.go @@ -7,16 +7,26 @@ import ( ) func DetectedHostAddress() string { - addrs, err := net.InterfaceAddrs() + netInterfaces, err := net.Interfaces() if err != nil { - glog.V(0).Infof("failed to detect ip address: %v", err) + glog.V(0).Infof("failed to detect net interfaces: %v", err) return "" } - for _, a := range addrs { - if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { - if ipnet.IP.To4() != nil { - return ipnet.IP.String() + for _, netInterface := range netInterfaces { + if (netInterface.Flags & net.FlagUp) == 0 { + continue + } + addrs, err := netInterface.Addrs() + if err != nil { + glog.V(0).Infof("get interface addresses: %v", err) + } + + for _, a := range addrs { + if ipNet, ok := a.(*net.IPNet); ok && !ipNet.IP.IsLoopback() { + if ipNet.IP.To4() != nil { + return ipNet.IP.String() + } } } } |