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

Skip checking Docker if DOCKER_HOST is set to an empty string

Browse Source
This commit is contained in:
henrygd
2025-04-28 20:23:54 -04:00
parent 88d6307ce0
commit 8e072492b7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beszel/internal/agent/agent.go
View File

@@ -95,12 +95,14 @@ func (a *Agent) gatherStats(sessionID string) *system.CombinedData {
} }
slog.Debug("System stats", "data", cachedData) slog.Debug("System stats", "data", cachedData)
if a.dockerManager != nil {
if containerStats, err := a.dockerManager.getDockerStats(); err == nil { if containerStats, err := a.dockerManager.getDockerStats(); err == nil {
cachedData.Containers = containerStats cachedData.Containers = containerStats
slog.Debug("Docker stats", "data", cachedData.Containers) slog.Debug("Docker stats", "data", cachedData.Containers)
} else { } else {
slog.Debug("Docker stats", "err", err) slog.Debug("Docker stats", "err", err)
} }
}
cachedData.Stats.ExtraFs = make(map[string]*system.FsStats) cachedData.Stats.ExtraFs = make(map[string]*system.FsStats)
for name, stats := range a.fsStats { for name, stats := range a.fsStats {

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

@@ -232,6 +232,10 @@ func newDockerManager(a *Agent) *dockerManager {
dockerHost, exists := GetEnv("DOCKER_HOST") dockerHost, exists := GetEnv("DOCKER_HOST")
if exists { if exists {
slog.Info("DOCKER_HOST", "host", dockerHost) slog.Info("DOCKER_HOST", "host", dockerHost)
// return nil if set to empty string
if dockerHost == "" {
return nil
}
} else { } else {
dockerHost = getDockerHost() dockerHost = getDockerHost()
} }