clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12259 from duglin/RemoveJobTop

Browse Source 
Remove Job from `docker top`
This commit is contained in:
Michael Crosby
2015-04-10 10:56:01 -07:00
parent 267bd51adb 3e096cb9c9
commit bae3273ef4
5 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+8 -3
View File
@@ -490,16 +490,21 @@ func getContainersTop(eng *engine.Engine, version version.Version, w http.Respon
if version.LessThan("1.4") {
return fmt.Errorf("top was improved a lot since 1.3, Please upgrade your docker client.")
}
if vars == nil {
return fmt.Errorf("Missing parameter")
}
if err := parseForm(r); err != nil {
return err
}
job := eng.Job("top", vars["name"], r.Form.Get("ps_args"))
streamJSON(job, w, false)
return job.Run()
procList, err := getDaemon(eng).ContainerTop(vars["name"], r.Form.Get("ps_args"))
if err != nil {
return err
}
return writeJSON(w, http.StatusOK, procList)
}
func getContainersJSON(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {