Add option to configure default proxy timeout

Should replace #976
TykTechnologies · Aug 4, 2017 · e5c2165 · e5c2165
1 parent f5f297a
commit e5c2165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -238,6 +238,7 @@ type Config struct {
 	MaxIdleConnsPerHost               int                                   `bson:"max_idle_connections_per_host" json:"max_idle_connections_per_host"`
 	ReloadWaitTime                    int                                   `bson:"reload_wait_time" json:"reload_wait_time"`
 	ProxySSLInsecureSkipVerify        bool                                  `json:"proxy_ssl_insecure_skip_verify"`
+	ProxyDefaultTimeout               int                                   `json:"proxy_default_timeout`
 }
 
 type CertData struct {

diff --git a/reverse_proxy.go b/reverse_proxy.go
@@ -369,7 +369,7 @@ func (p *ReverseProxy) ServeHTTPForCache(rw http.ResponseWriter, req *http.Reque
 
 func (p *ReverseProxy) CheckHardTimeoutEnforced(spec *APISpec, req *http.Request) (bool, int) {
 	if !spec.EnforcedTimeoutEnabled {
-		return false, 0
+		return false, globalConf.ProxyDefaultTimeout
 	}
 
 	_, versionPaths, _, _ := spec.Version(req)
@@ -380,7 +380,7 @@ func (p *ReverseProxy) CheckHardTimeoutEnforced(spec *APISpec, req *http.Request
 		return true, *intMeta
 	}
 
-	return false, 0
+	return false, globalConf.ProxyDefaultTimeout
 }
 
 func (p *ReverseProxy) CheckCircuitBreakerEnforced(spec *APISpec, req *http.Request) (bool, *ExtendedCircuitBreakerMeta) {