dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-13 17:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50767 from thaJeztah/stats_cleanups

Browse Source 
daemon: Daemon.ContainerStats: small cleanups
This commit is contained in:
Austin Vazquez
2025-08-20 15:25:42 -07:00
committed by GitHub
parent f445d26d68 000f5e8d10
commit 4774fb2c11
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/stats.go
View File

@@ -26,11 +26,9 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
return errdefs.InvalidParameter(errors.New("cannot have stream=true and one-shot=true"))
}
enc := json.NewEncoder(config.OutStream())
// If the container is either not running or restarting and requires no stream, return an empty stats.
if (!ctr.IsRunning() || ctr.IsRestarting()) && !config.Stream {
return enc.Encode(&containertypes.StatsResponse{
if !config.Stream && (!ctr.IsRunning() || ctr.IsRestarting()) {
return json.NewEncoder(config.OutStream()).Encode(&containertypes.StatsResponse{
Name: ctr.Name,
ID: ctr.ID,
})
@@ -42,7 +40,7 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
if err != nil {
return err
}
return enc.Encode(stats)
return json.NewEncoder(config.OutStream()).Encode(stats)
}
var preCPUStats containertypes.CPUStats
@@ -63,6 +61,7 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
noStreamFirstFrame := !config.OneShot
enc := json.NewEncoder(config.OutStream())
for {
select {
case v, ok := <-updates: