mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2026-01-04 03:54:58 +01:00
Code Issues Projects Releases Wiki Activity

fix: properly closes unused connections (#3080)

Browse Source
This commit is contained in:
Amir Raminfar
2024-07-09 13:02:15 -07:00
committed by GitHub
parent 09d5470053
commit b8662ff8d5
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/support/docker/multi_host_service.go
View File

@@ -45,14 +45,14 @@ func NewMultiHostService(clients []ClientService) *MultiHostService {
return m
}
func NewSwarmService(client docker.Client, certificates tls.Certificate) *MultiHostService {
func NewSwarmService(localClient docker.Client, certificates tls.Certificate) *MultiHostService {
m := &MultiHostService{
clients: make(map[string]ClientService),
SwarmMode: true,
}
localClient := NewDockerClientService(client)
m.clients[localClient.Host().ID] = localClient
localService := NewDockerClientService(localClient)
m.clients[localClient.Host().ID] = localService
discover := func() {
ips, err := net.LookupIP("tasks.dozzle")
@@ -63,17 +63,18 @@ func NewSwarmService(client docker.Client, certificates tls.Certificate) *MultiH
found := 0
replaced := 0
for _, ip := range ips {
client, err := agent.NewClient(ip.String()+":7007", certificates)
clientAgent, err := agent.NewClient(ip.String()+":7007", certificates)
if err != nil {
log.Warnf("error creating client for %s: %v", ip, err)
continue
}
if client.Host().ID == localClient.Host().ID {
if clientAgent.Host().ID == localClient.Host().ID {
closeAgent(clientAgent)
continue
}
service := NewAgentService(client)
service := NewAgentService(clientAgent)
if existing, ok := m.clients[service.Host().ID]; !ok {
log.Debugf("adding swarm service %s", service.Host().ID)
m.clients[service.Host().ID] = service
@@ -83,6 +84,11 @@ func NewSwarmService(client docker.Client, certificates tls.Certificate) *MultiH
delete(m.clients, existing.Host().ID)
m.clients[service.Host().ID] = service
replaced++
if existingAgent, ok := existing.(*agentService); ok {
closeAgent(existingAgent.client)
}
} else {
closeAgent(clientAgent)
}
}
@@ -107,6 +113,13 @@ func NewSwarmService(client docker.Client, certificates tls.Certificate) *MultiH
return m
}
func closeAgent(agent *agent.Client) {
log.Debugf("closing agent %s", agent.Host().ID)
if err := agent.Close(); err != nil {
log.Warnf("error closing agent: %v", err)
}
}
func (m *MultiHostService) FindContainer(host string, id string) (*containerService, error) {
client, ok := m.clients[host]
if !ok {