From 6cf6661f2eb7a9b624d55097aed314f6f45e81aa Mon Sep 17 00:00:00 2001 From: Henry Dollman Date: Sat, 12 Oct 2024 12:24:53 -0400 Subject: [PATCH] raise docker client timeout to 8 seconds if version <= 24 --- beszel/internal/agent/docker.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beszel/internal/agent/docker.go b/beszel/internal/agent/docker.go index 1097ce9..306cfc2 100644 --- a/beszel/internal/agent/docker.go +++ b/beszel/internal/agent/docker.go @@ -219,7 +219,7 @@ func newDockerManager() *dockerManager { dockerClient := &dockerManager{ client: &http.Client{ - Timeout: time.Millisecond * 2100, + Timeout: time.Second * 8, Transport: transport, }, containerStatsMap: make(map[string]*container.Stats), @@ -243,9 +243,10 @@ func newDockerManager() *dockerManager { return dockerClient } - // if version > 25, one-shot works correctly and we can limit concurrent connections / goroutines to 5 + // if version > 24, one-shot works correctly and we can limit concurrent operations if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 { concurrency = 5 + dockerClient.client.Timeout = time.Millisecond * 1100 } slog.Debug("Docker", "version", versionInfo.Version, "concurrency", concurrency)