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

Cleans up stats worker routine

Browse Source
This commit is contained in:
Amir Raminfar
2020-12-14 11:51:53 -08:00
parent 7e02e7a407
commit 84fb187449
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/client.go
View File

@@ -150,6 +150,7 @@ func logReader(reader io.ReadCloser, tty bool) func() (string, error) {
}
func (d *dockerClient) ContainerStats(ctx context.Context, id string, stats chan<- ContainerStat) error {
id = id[:12]
response, err := d.cli.ContainerStats(ctx, id, true)
if err != nil {
@@ -157,6 +158,7 @@ func (d *dockerClient) ContainerStats(ctx context.Context, id string, stats chan
}
go func() {
log.Debugf("starting to stream stats for: %s", id)
defer response.Body.Close()
decoder := json.NewDecoder(response.Body)
var v *types.StatsJSON
@@ -164,7 +166,7 @@ func (d *dockerClient) ContainerStats(ctx context.Context, id string, stats chan
if err := decoder.Decode(&v); err != nil {
if err == context.Canceled || err == io.EOF {
log.Debugf("stopping stats streaming for container %s", id)
break
return
}
log.Errorf("decoder for stats api returned an unknown error %v", err)
}

29
routes.go
View File

@@ -157,12 +157,12 @@ func (h *handler) streamEvents(w http.ResponseWriter, r *http.Request) {
messages, err := h.client.Events(ctx)
stats := make(chan docker.ContainerStat)
runningContainers := map[string]docker.Container{}
if containers, err := h.client.ListContainers(); err == nil {
for _, c := range containers {
if c.State == "running" {
h.client.ContainerStats(ctx, c.ID, stats)
runningContainers[c.ID] = c
if err := h.client.ContainerStats(ctx, c.ID, stats); err != nil {
log.Errorf("Error while streaming container stats: %v", err)
}
}
}
}
@@ -173,7 +173,6 @@ func (h *handler) streamEvents(w http.ResponseWriter, r *http.Request) {
f.Flush()
Loop:
for {
select {
case stat := <-stats:
@@ -186,28 +185,22 @@ Loop:
f.Flush()
case message, ok := <-messages:
if !ok {
break Loop
return
}
switch message.Action {
case "start", "connect", "disconnect", "die":
case "start", "die":
log.Debugf("Triggering docker event: %v", message.Action)
if message.Action == "start" {
log.Debugf("Scanning for new containers")
if containers, err := h.client.ListContainers(); err == nil {
for _, c := range containers {
if _, ok = runningContainers[c.ID]; c.State == "running" && !ok {
log.Debugf("Found a new container %v", c.ID)
h.client.ContainerStats(ctx, c.ID, stats)
runningContainers[c.ID] = c
}
}
log.Debugf("Found new container with id: %v", message.Actor.ID)
if err := h.client.ContainerStats(ctx, message.Actor.ID, stats); err != nil {
log.Errorf("Error when streaming new container stats: %v", err)
}
}
time.Sleep(time.Second)
if err := sendContainersJSON(h.client, w); err != nil {
log.Errorf("Error while encoding containers to stream: %v", err)
break Loop
return
}
f.Flush()
@@ -215,9 +208,9 @@ Loop:
log.Debugf("Ignoring docker event: %v", message.Action)
}
case <-ctx.Done():
break Loop
return
case <-err:
break Loop
return
}
}
}