fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-20 10:19:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

raise docker client timeout to 8 seconds if version <= 24

Browse Source
This commit is contained in:
Henry Dollman
2024-10-12 12:24:53 -04:00
parent 23ab1208cd
commit 6cf6661f2e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
beszel/internal/agent/docker.go
View File

@@ -219,7 +219,7 @@ func newDockerManager() *dockerManager {
dockerClient := &dockerManager{ dockerClient := &dockerManager{
client: &http.Client{ client: &http.Client{
Timeout: time.Millisecond * 2100, Timeout: time.Second * 8,
Transport: transport, Transport: transport,
}, },
containerStatsMap: make(map[string]*container.Stats), containerStatsMap: make(map[string]*container.Stats),
@@ -243,9 +243,10 @@ func newDockerManager() *dockerManager {
return dockerClient 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 { if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 {
concurrency = 5 concurrency = 5
dockerClient.client.Timeout = time.Millisecond * 1100
} }
slog.Debug("Docker", "version", versionInfo.Version, "concurrency", concurrency) slog.Debug("Docker", "version", versionInfo.Version, "concurrency", concurrency)