Added config options for proxy max idle connections

claceio · Sep 12, 2024 · dd09dcb · dd09dcb
1 parent 477aebc
commit dd09dcb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/internal/app/setup.go b/internal/app/setup.go
@@ -15,6 +15,7 @@ import (
 	"path"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/claceio/clace/internal/app/appfs"
 	"github.com/claceio/clace/internal/app/apptype"
@@ -655,6 +656,16 @@ func (a *App) addProxyConfig(count int, router *chi.Mux, proxyDef *starlarkstruc
 	}
 
 	proxy := httputil.NewSingleHostReverseProxy(url)
+
+	customTransport := http.DefaultTransport.(*http.Transport).Clone()
+	maxIdleConnCount := a.appConfig.Proxy.MaxIdleConns
+	customTransport.MaxConnsPerHost = maxIdleConnCount * 2
+	customTransport.MaxIdleConns = maxIdleConnCount
+	customTransport.MaxIdleConnsPerHost = maxIdleConnCount
+	customTransport.IdleConnTimeout = time.Duration(a.appConfig.Proxy.IdleConnTimeoutSecs) * time.Second
+	customTransport.DisableCompression = a.appConfig.Proxy.DisableCompression
+	proxy.Transport = customTransport
+
 	defaultDirector := proxy.Director
 	proxy.Director = func(req *http.Request) {
 		defaultDirector(req)

diff --git a/internal/system/clace.default.toml b/internal/system/clace.default.toml
@@ -83,3 +83,8 @@ container.idle_shutdown_dev_apps = false
 # Status check Config
 container.status_check_interval_secs = 5
 container.status_health_attempts = 3
+
+# Proxy related settings
+proxy.max_idle_conns = 250
+proxy.idle_conn_timeout_secs = 15
+proxy.disable_compression = true
diff --git a/internal/system/config_test.go b/internal/system/config_test.go
@@ -72,6 +72,10 @@ func TestServerConfig(t *testing.T) {
 	testutil.AssertEqualsInt(t, "idle", 180, c.AppConfig.Container.IdleShutdownSecs)
 	testutil.AssertEqualsInt(t, "status interval", 5, c.AppConfig.Container.StatusCheckIntervalSecs)
 	testutil.AssertEqualsInt(t, "status attempts", 3, c.AppConfig.Container.StatusHealthAttempts)
+
+	testutil.AssertEqualsInt(t, "proxy max idle", 250, c.AppConfig.Proxy.MaxIdleConns)
+	testutil.AssertEqualsInt(t, "proxy idle timeout", 15, c.AppConfig.Proxy.IdleConnTimeoutSecs)
+	testutil.AssertEqualsBool(t, "proxy disable compression", true, c.AppConfig.Proxy.DisableCompression)
 }
 
 func TestClientConfig(t *testing.T) {

diff --git a/internal/system/http.go b/internal/system/http.go
@@ -61,6 +61,8 @@ func NewHttpClient(serverUri, user, password string, skipCertCheck bool) *HttpCl
 	} else {
 		customTransport := http.DefaultTransport.(*http.Transport).Clone()
 		customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: skipCertCheck}
+		customTransport.MaxIdleConns = 500
+		customTransport.MaxIdleConnsPerHost = 500
 		client = &http.Client{
 			Transport: customTransport,
 			Timeout:   time.Duration(180) * time.Second,

diff --git a/internal/types/types.go b/internal/types/types.go
@@ -69,6 +69,7 @@ type SecretConfig map[string]any
 type AppConfig struct {
 	CORS      CORS      `toml:"cors"`
 	Container Container `toml:"container"`
+	Proxy     Proxy     `toml:"proxy"`
 }
 
 type CORS struct {
@@ -94,6 +95,13 @@ type Container struct {
 	StatusHealthAttempts    int `toml:"status_health_attempts"`
 }
 
+type Proxy struct {
+	// Proxy related config
+	MaxIdleConns        int  `toml:"max_idle_conns"`
+	IdleConnTimeoutSecs int  `toml:"idle_conn_timeout_secs"`
+	DisableCompression  bool `toml:"disable_compression"`
+}
+
 type PluginContext struct {
 	Logger    *Logger
 	AppId     AppId