Implement ConnectTimeout and stub out Timeout

Author: ncw

notes.txt

@@ -1,11 +1,9 @@
 Notes on Go Swift
 =================
 
-Test that time works if pc timezone is not GMT
-
 Make a container struct so these could be methods on it?
 
-// FIXME make noResponse check for 204?
+Make noResponse check for 204?
 
 Make storage public so it can be extended easily?
 
@@ -46,7 +44,4 @@ Copy/Rename object
 
 Swift client retries and backs off for all types of errors
 
-Write a script which uses this and replicates the functionality of swift tool
-
-path parameter is missing in the docs for Objects() but supported by the server
-  is it deprecated?  or are the docs faults?
+Make Timeout work as well as ConnectionTimeout

swift.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"net"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -34,15 +35,17 @@ const (
 //  Rackspace UK        https://lon.auth.api.rackspacecloud.com/v1.0
 //  Memset Memstore UK  https://auth.storage.memset.com/v1.0
 type Connection struct {
-	UserName   string // UserName for api
-	ApiKey     string // Key for api access
-	AuthUrl    string // Auth URL
-	Retries    int    // Retries on error (default is 3)
-	UserAgent  string // Http User agent (default goswift/1.0)
-	storageUrl string
-	authToken  string
-	tr         *http.Transport
-	client     *http.Client
+	UserName       string        // UserName for api
+	ApiKey         string        // Key for api access
+	AuthUrl        string        // Auth URL
+	Retries        int           // Retries on error (default is 3)
+	UserAgent      string        // Http User agent (default goswift/1.0)
+	ConnectTimeout time.Duration // Connect channel timeout (default 10s)
+	Timeout        time.Duration // Data channel timeout (default 60s) NOT IMPLEMENTED
+	storageUrl     string
+	authToken      string
+	tr             *http.Transport
+	client         *http.Client
 }
 
 // Error - all errors generated by this package are of this type.  Other error
@@ -149,10 +152,31 @@ func (c *Connection) Authenticate() (err error) {
 	if c.Retries == 0 {
 		c.Retries = DefaultRetries
 	}
+	if c.ConnectTimeout == 0 {
+		c.ConnectTimeout = 10 * time.Second
+	}
+	if c.Timeout == 0 {
+		c.Timeout = 60 * time.Second
+	}
 	if c.tr == nil {
 		c.tr = &http.Transport{
-		//		TLSClientConfig:    &tls.Config{RootCAs: pool},
-		//		DisableCompression: true,
+			//		TLSClientConfig:    &tls.Config{RootCAs: pool},
+			//		DisableCompression: true,
+
+			// Dial with deadline
+			//
+			// FIXME not sure how this plays with connection pooling
+			Dial: func(network, addr string) (net.Conn, error) {
+				conn, err := net.DialTimeout(network, addr, c.ConnectTimeout)
+				if err != nil {
+					return nil, err
+				}
+				// FIXME Need to continuously bump this
+				// deadline forwards but can't figure
+				// out how to get the net.Conn out of the Request
+				// conn.SetDeadline(time.Now().Add(c.Timeout))
+				return conn, nil
+			},
 		}
 	}
 	if c.client == nil {