diff options
Diffstat (limited to 'weed/util/net_timeout.go')
| -rw-r--r-- | weed/util/net_timeout.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.go index 022c651d9..f235a77b3 100644 --- a/weed/util/net_timeout.go +++ b/weed/util/net_timeout.go @@ -83,14 +83,14 @@ func (c *Conn) Close() error { return err } -func NewListener(addr string, timeout time.Duration) (ipListner net.Listener, err error) { - listner, err := net.Listen("tcp", addr) +func NewListener(addr string, timeout time.Duration) (ipListener net.Listener, err error) { + listener, err := net.Listen("tcp", addr) if err != nil { return } - ipListner = &Listener{ - Listener: listner, + ipListener = &Listener{ + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, } @@ -98,27 +98,27 @@ func NewListener(addr string, timeout time.Duration) (ipListner net.Listener, er return } -func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipListner net.Listener, localListener net.Listener, err error) { - listner, err := net.Listen("tcp", JoinHostPort(host, port)) +func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipListener net.Listener, localListener net.Listener, err error) { + listener, err := net.Listen("tcp", JoinHostPort(host, port)) if err != nil { return } - ipListner = &Listener{ - Listener: listner, + ipListener = &Listener{ + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, } 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)) + listener, err = net.Listen("tcp", JoinHostPort("localhost", port)) if err != nil { glog.V(0).Infof("skip starting on %s:%d: %v", host, port, err) - return ipListner, nil, nil + return ipListener, nil, nil } localListener = &Listener{ - Listener: listner, + Listener: listener, ReadTimeout: timeout, WriteTimeout: timeout, } |