kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Move TimeoutConn to seperate pkg dir.

Browse source 
Fixes #10965
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
This commit is contained in:
Rik Nijessen 2015-02-25 16:59:29 +01:00
parent 309eec2378
commit 690a85797e
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
utils/timeoutconn.go → pkg/timeout/timeout.go
View file

@ -1,21 +1,21 @@
package utils package timeout
import ( import (
"net" "net"
"time" "time"
) )
func NewTimeoutConn(conn net.Conn, timeout time.Duration) net.Conn { func New(netConn net.Conn, timeout time.Duration) net.Conn {
return &TimeoutConn{conn, timeout} return &conn{netConn, timeout}
} }
// A net.Conn that sets a deadline for every Read or Write operation // A net.Conn that sets a deadline for every Read or Write operation
type TimeoutConn struct { type conn struct {
net.Conn net.Conn
timeout time.Duration timeout time.Duration
} }
func (c *TimeoutConn) Read(b []byte) (int, error) { func (c *conn) Read(b []byte) (int, error) {
if c.timeout > 0 { if c.timeout > 0 {
err := c.Conn.SetReadDeadline(time.Now().Add(c.timeout)) err := c.Conn.SetReadDeadline(time.Now().Add(c.timeout))
if err != nil { if err != nil {

6
utils/timeoutconn_test.go → pkg/timeout/timeout_test.go
View file

@ -1,4 +1,4 @@
package utils package timeout
import ( import (
"bufio" "bufio"
@ -10,7 +10,7 @@ import (
"time" "time"
) )
func TestTimeoutConnRead(t *testing.T) { func TestRead(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, "hello") fmt.Fprintln(w, "hello")
})) }))
@ -19,7 +19,7 @@ func TestTimeoutConnRead(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed to create connection to %q: %v", ts.URL, err) t.Fatalf("failed to create connection to %q: %v", ts.URL, err)
} }
tconn := NewTimeoutConn(conn, 1*time.Second) tconn := New(conn, 1*time.Second)
if _, err = bufio.NewReader(tconn).ReadString('\n'); err == nil { if _, err = bufio.NewReader(tconn).ReadString('\n'); err == nil {
t.Fatalf("expected timeout error, got none") t.Fatalf("expected timeout error, got none")

4
registry/registry.go
View file

@ -14,7 +14,7 @@ import (
"time" "time"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/docker/utils" "github.com/docker/docker/pkg/timeout"
) )
var ( var (
@ -71,7 +71,7 @@ func newClient(jar http.CookieJar, roots *x509.CertPool, certs []tls.Certificate
if err != nil { if err != nil {
return nil, err return nil, err
} }
conn = utils.NewTimeoutConn(conn, 1*time.Minute) conn = timeout.New(conn, 1*time.Minute)
return conn, nil return conn, nil
} }
} }