Fix custom timeouts

Signed-off-by: Alex Ellis <[email protected]>
openfaas · Oct 26, 2017 · 61e2959 · 61e2959
1 parent 85612b4
commit 61e2959
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/proxy/deploy.go b/proxy/deploy.go
@@ -57,7 +57,7 @@ func DeployFunction(fprocess string, gateway string, functionName string, image
 	reader := bytes.NewReader(reqBytes)
 	var request *http.Request
 
-	timeout := 120 * time.Second
+	timeout := 60 * time.Second
 	client := MakeHTTPClient(&timeout)
 
 	method := http.MethodPost

diff --git a/proxy/list.go b/proxy/list.go
@@ -20,7 +20,7 @@ func ListFunctions(gateway string) ([]requests.Function, error) {
 
 	gateway = strings.TrimRight(gateway, "/")
 
-	timeout := 120 * time.Second
+	timeout := 60 * time.Second
 	client := MakeHTTPClient(&timeout)
 
 	getRequest, _ := http.NewRequest(http.MethodGet, gateway+"/system/functions", nil)

diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -13,11 +13,11 @@ import (
 func MakeHTTPClient(timeout *time.Duration) http.Client {
 	if timeout != nil {
 		return http.Client{
-			Timeout: 3 * time.Second,
+			Timeout: *timeout,
 			Transport: &http.Transport{
 				Proxy: http.ProxyFromEnvironment,
 				DialContext: (&net.Dialer{
-					Timeout: 3 * time.Second,
+					Timeout: *timeout,
 					// KeepAlive: 0,
 				}).DialContext,
 				// MaxIdleConns:          1,