aboutsummaryrefslogtreecommitdiff
path: root/weed/util
diff options
context:
space:
mode:
Diffstat (limited to 'weed/util')
-rw-r--r--weed/util/constants.go2
-rw-r--r--weed/util/net_timeout.go6
2 files changed, 5 insertions, 3 deletions
diff --git a/weed/util/constants.go b/weed/util/constants.go
index 5518f1c0e..66bfca982 100644
--- a/weed/util/constants.go
+++ b/weed/util/constants.go
@@ -5,7 +5,7 @@ import (
)
var (
- VERSION_NUMBER = fmt.Sprintf("%.02f", 2.99)
+ VERSION_NUMBER = fmt.Sprintf("%.02f", 3.02)
VERSION = sizeLimit + " " + VERSION_NUMBER
COMMIT = ""
)
diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.go
index abb96c403..536359eec 100644
--- a/weed/util/net_timeout.go
+++ b/weed/util/net_timeout.go
@@ -1,6 +1,7 @@
package util
import (
+ "github.com/chrislusf/seaweedfs/weed/glog"
"net"
"time"
@@ -109,10 +110,11 @@ func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipLis
WriteTimeout: timeout,
}
- if host != "localhost" && host != "" && host != "0.0.0.0" && host != "127.0.0.1" {
+ if host != "localhost" && host != "" && host != "0.0.0.0" && host != "127.0.0.1" && host != "[::]" && host != "[::1]" {
listner, err = net.Listen("tcp", JoinHostPort("localhost", port))
if err != nil {
- return
+ glog.V(0).Infof("skip starting on %s:%d: %v", host, port, err)
+ return ipListner, nil, nil
}
localListener = &Listener{