Skip to content

fix for swarmpit issue #262 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cherbst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for swarmpit issue #262 #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions swarmpit/task/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package task
import (
"context"
"encoding/json"
"io"
"log"
"runtime"
"sync"
Expand Down Expand Up @@ -149,7 +148,14 @@ func ContainerUsage(cli *client.Client, id string) (status ContainerStatus) {
defer resp.Body.Close()
dec := json.NewDecoder(resp.Body)
if err := dec.Decode(&v); err != nil {
dec = json.NewDecoder(io.MultiReader(dec.Buffered(), resp.Body))
log.Printf("ERROR: Failed to decode container stats for %s: %s\n", id, err)
return
}

// Add nil check to prevent panic
if v == nil {
log.Printf("ERROR: Container stats data is nil for container %s\n", id)
return
}

var daemonOSType = resp.OSType
Expand Down