Browse code
Move "top" to daemon/top.go
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Solomon Hykes authored on 2014/08/01 06:21:38Showing 4 changed files
| ... | ... |
@@ -158,6 +158,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
|
| 158 | 158 |
if err := eng.Register("container_changes", daemon.ContainerChanges); err != nil {
|
| 159 | 159 |
return err |
| 160 | 160 |
} |
| 161 |
+ if err := eng.Register("top", daemon.ContainerTop); err != nil {
|
|
| 162 |
+ return err |
|
| 163 |
+ } |
|
| 161 | 164 |
return nil |
| 162 | 165 |
} |
| 163 | 166 |
|
| 164 | 167 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,79 @@ |
| 0 |
+package daemon |
|
| 1 |
+ |
|
| 2 |
+import ( |
|
| 3 |
+ "os/exec" |
|
| 4 |
+ "strconv" |
|
| 5 |
+ "strings" |
|
| 6 |
+ |
|
| 7 |
+ "github.com/docker/docker/engine" |
|
| 8 |
+) |
|
| 9 |
+ |
|
| 10 |
+func (daemon *Daemon) ContainerTop(job *engine.Job) engine.Status {
|
|
| 11 |
+ if len(job.Args) != 1 && len(job.Args) != 2 {
|
|
| 12 |
+ return job.Errorf("Not enough arguments. Usage: %s CONTAINER [PS_ARGS]\n", job.Name)
|
|
| 13 |
+ } |
|
| 14 |
+ var ( |
|
| 15 |
+ name = job.Args[0] |
|
| 16 |
+ psArgs = "-ef" |
|
| 17 |
+ ) |
|
| 18 |
+ |
|
| 19 |
+ if len(job.Args) == 2 && job.Args[1] != "" {
|
|
| 20 |
+ psArgs = job.Args[1] |
|
| 21 |
+ } |
|
| 22 |
+ |
|
| 23 |
+ if container := daemon.Get(name); container != nil {
|
|
| 24 |
+ if !container.State.IsRunning() {
|
|
| 25 |
+ return job.Errorf("Container %s is not running", name)
|
|
| 26 |
+ } |
|
| 27 |
+ pids, err := daemon.ExecutionDriver().GetPidsForContainer(container.ID) |
|
| 28 |
+ if err != nil {
|
|
| 29 |
+ return job.Error(err) |
|
| 30 |
+ } |
|
| 31 |
+ output, err := exec.Command("ps", psArgs).Output()
|
|
| 32 |
+ if err != nil {
|
|
| 33 |
+ return job.Errorf("Error running ps: %s", err)
|
|
| 34 |
+ } |
|
| 35 |
+ |
|
| 36 |
+ lines := strings.Split(string(output), "\n") |
|
| 37 |
+ header := strings.Fields(lines[0]) |
|
| 38 |
+ out := &engine.Env{}
|
|
| 39 |
+ out.SetList("Titles", header)
|
|
| 40 |
+ |
|
| 41 |
+ pidIndex := -1 |
|
| 42 |
+ for i, name := range header {
|
|
| 43 |
+ if name == "PID" {
|
|
| 44 |
+ pidIndex = i |
|
| 45 |
+ } |
|
| 46 |
+ } |
|
| 47 |
+ if pidIndex == -1 {
|
|
| 48 |
+ return job.Errorf("Couldn't find PID field in ps output")
|
|
| 49 |
+ } |
|
| 50 |
+ |
|
| 51 |
+ processes := [][]string{}
|
|
| 52 |
+ for _, line := range lines[1:] {
|
|
| 53 |
+ if len(line) == 0 {
|
|
| 54 |
+ continue |
|
| 55 |
+ } |
|
| 56 |
+ fields := strings.Fields(line) |
|
| 57 |
+ p, err := strconv.Atoi(fields[pidIndex]) |
|
| 58 |
+ if err != nil {
|
|
| 59 |
+ return job.Errorf("Unexpected pid '%s': %s", fields[pidIndex], err)
|
|
| 60 |
+ } |
|
| 61 |
+ |
|
| 62 |
+ for _, pid := range pids {
|
|
| 63 |
+ if pid == p {
|
|
| 64 |
+ // Make sure number of fields equals number of header titles |
|
| 65 |
+ // merging "overhanging" fields |
|
| 66 |
+ process := fields[:len(header)-1] |
|
| 67 |
+ process = append(process, strings.Join(fields[len(header)-1:], " ")) |
|
| 68 |
+ processes = append(processes, process) |
|
| 69 |
+ } |
|
| 70 |
+ } |
|
| 71 |
+ } |
|
| 72 |
+ out.SetJson("Processes", processes)
|
|
| 73 |
+ out.WriteTo(job.Stdout) |
|
| 74 |
+ return engine.StatusOK |
|
| 75 |
+ |
|
| 76 |
+ } |
|
| 77 |
+ return job.Errorf("No such container: %s", name)
|
|
| 78 |
+} |
| ... | ... |
@@ -7,8 +7,6 @@ package server |
| 7 | 7 |
import ( |
| 8 | 8 |
"errors" |
| 9 | 9 |
"fmt" |
| 10 |
- "os/exec" |
|
| 11 |
- "strconv" |
|
| 12 | 10 |
"strings" |
| 13 | 11 |
|
| 14 | 12 |
"github.com/docker/docker/daemon" |
| ... | ... |
@@ -16,76 +14,6 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/pkg/graphdb" |
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 |
-func (srv *Server) ContainerTop(job *engine.Job) engine.Status {
|
|
| 20 |
- if len(job.Args) != 1 && len(job.Args) != 2 {
|
|
| 21 |
- return job.Errorf("Not enough arguments. Usage: %s CONTAINER [PS_ARGS]\n", job.Name)
|
|
| 22 |
- } |
|
| 23 |
- var ( |
|
| 24 |
- name = job.Args[0] |
|
| 25 |
- psArgs = "-ef" |
|
| 26 |
- ) |
|
| 27 |
- |
|
| 28 |
- if len(job.Args) == 2 && job.Args[1] != "" {
|
|
| 29 |
- psArgs = job.Args[1] |
|
| 30 |
- } |
|
| 31 |
- |
|
| 32 |
- if container := srv.daemon.Get(name); container != nil {
|
|
| 33 |
- if !container.State.IsRunning() {
|
|
| 34 |
- return job.Errorf("Container %s is not running", name)
|
|
| 35 |
- } |
|
| 36 |
- pids, err := srv.daemon.ExecutionDriver().GetPidsForContainer(container.ID) |
|
| 37 |
- if err != nil {
|
|
| 38 |
- return job.Error(err) |
|
| 39 |
- } |
|
| 40 |
- output, err := exec.Command("ps", psArgs).Output()
|
|
| 41 |
- if err != nil {
|
|
| 42 |
- return job.Errorf("Error running ps: %s", err)
|
|
| 43 |
- } |
|
| 44 |
- |
|
| 45 |
- lines := strings.Split(string(output), "\n") |
|
| 46 |
- header := strings.Fields(lines[0]) |
|
| 47 |
- out := &engine.Env{}
|
|
| 48 |
- out.SetList("Titles", header)
|
|
| 49 |
- |
|
| 50 |
- pidIndex := -1 |
|
| 51 |
- for i, name := range header {
|
|
| 52 |
- if name == "PID" {
|
|
| 53 |
- pidIndex = i |
|
| 54 |
- } |
|
| 55 |
- } |
|
| 56 |
- if pidIndex == -1 {
|
|
| 57 |
- return job.Errorf("Couldn't find PID field in ps output")
|
|
| 58 |
- } |
|
| 59 |
- |
|
| 60 |
- processes := [][]string{}
|
|
| 61 |
- for _, line := range lines[1:] {
|
|
| 62 |
- if len(line) == 0 {
|
|
| 63 |
- continue |
|
| 64 |
- } |
|
| 65 |
- fields := strings.Fields(line) |
|
| 66 |
- p, err := strconv.Atoi(fields[pidIndex]) |
|
| 67 |
- if err != nil {
|
|
| 68 |
- return job.Errorf("Unexpected pid '%s': %s", fields[pidIndex], err)
|
|
| 69 |
- } |
|
| 70 |
- |
|
| 71 |
- for _, pid := range pids {
|
|
| 72 |
- if pid == p {
|
|
| 73 |
- // Make sure number of fields equals number of header titles |
|
| 74 |
- // merging "overhanging" fields |
|
| 75 |
- process := fields[:len(header)-1] |
|
| 76 |
- process = append(process, strings.Join(fields[len(header)-1:], " ")) |
|
| 77 |
- processes = append(processes, process) |
|
| 78 |
- } |
|
| 79 |
- } |
|
| 80 |
- } |
|
| 81 |
- out.SetJson("Processes", processes)
|
|
| 82 |
- out.WriteTo(job.Stdout) |
|
| 83 |
- return engine.StatusOK |
|
| 84 |
- |
|
| 85 |
- } |
|
| 86 |
- return job.Errorf("No such container: %s", name)
|
|
| 87 |
-} |
|
| 88 |
- |
|
| 89 | 19 |
func (srv *Server) Containers(job *engine.Job) engine.Status {
|
| 90 | 20 |
var ( |
| 91 | 21 |
foundBefore bool |