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

add DOCKER_TIMEOUT env var

Browse Source
This commit is contained in:
Henry Dollman
2024-10-19 16:33:33 -04:00
parent 140fd93ec9
commit 8bf7a0e1d6
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,9 +217,20 @@ func newDockerManager() *dockerManager {
os.Exit(1) os.Exit(1)
} }
// configurable timeout
timeout := time.Millisecond * 2100
if t, set := os.LookupEnv("DOCKER_TIMEOUT"); set {
timeout, err = time.ParseDuration(t)
if err != nil {
slog.Error(err.Error())
os.Exit(1)
}
slog.Info("DOCKER_TIMEOUT", "timeout", timeout)
}
dockerClient := &dockerManager{ dockerClient := &dockerManager{
client: &http.Client{ client: &http.Client{
Timeout: time.Second * 8, Timeout: timeout,
Transport: transport, Transport: transport,
}, },
containerStatsMap: make(map[string]*container.Stats), containerStatsMap: make(map[string]*container.Stats),
@@ -246,7 +257,6 @@ func newDockerManager() *dockerManager {
// if version > 24, one-shot works correctly and we can limit concurrent operations // 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)