kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove jobs from stats

Browse source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca 2015-04-13 08:33:53 +02:00
parent a54fd325e6
commit 65a056345c
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/server/server.go
View file

@ -543,10 +543,10 @@ func getContainersStats(eng *engine.Engine, version version.Version, w http.Resp
if vars == nil { if vars == nil {
return fmt.Errorf("Missing parameter") return fmt.Errorf("Missing parameter")
} }
name := vars["name"]
job := eng.Job("container_stats", name) d := getDaemon(eng)
streamJSON(job, w, true)
return job.Run() return d.ContainerStats(vars["name"], utils.NewWriteFlusher(w))
} }
func getContainersLogs(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func getContainersLogs(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

1
daemon/daemon.go
View file

@ -119,7 +119,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
for name, method := range map[string]engine.Handler{ for name, method := range map[string]engine.Handler{
"commit": daemon.ContainerCommit, "commit": daemon.ContainerCommit,
"container_inspect": daemon.ContainerInspect, "container_inspect": daemon.ContainerInspect,
"container_stats": daemon.ContainerStats,
"create": daemon.ContainerCreate, "create": daemon.ContainerCreate,
"export": daemon.ContainerExport, "export": daemon.ContainerExport,
"info": daemon.CmdInfo, "info": daemon.CmdInfo,

10
daemon/stats.go
View file

@ -2,20 +2,20 @@ package daemon
import ( import (
"encoding/json" "encoding/json"
"io"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/engine"
"github.com/docker/libcontainer" "github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
) )
func (daemon *Daemon) ContainerStats(job *engine.Job) error { func (daemon *Daemon) ContainerStats(name string, out io.Writer) error {
updates, err := daemon.SubscribeToContainerStats(job.Args[0]) updates, err := daemon.SubscribeToContainerStats(name)
if err != nil { if err != nil {
return err return err
} }
enc := json.NewEncoder(job.Stdout) enc := json.NewEncoder(out)
for v := range updates { for v := range updates {
update := v.(*execdriver.ResourceStats) update := v.(*execdriver.ResourceStats)
ss := convertToAPITypes(update.Stats) ss := convertToAPITypes(update.Stats)
@ -24,7 +24,7 @@ func (daemon *Daemon) ContainerStats(job *engine.Job) error {
ss.CpuStats.SystemUsage = update.SystemUsage ss.CpuStats.SystemUsage = update.SystemUsage
if err := enc.Encode(ss); err != nil { if err := enc.Encode(ss); err != nil {
// TODO: handle the specific broken pipe // TODO: handle the specific broken pipe
daemon.UnsubscribeToContainerStats(job.Args[0], updates) daemon.UnsubscribeToContainerStats(name, updates)
return err return err
} }
} }