vbatts
/
containerd
1
0
Fork 0
Code Pull Requests Releases Activity

Return nil processes with no pid

This commit is contained in:
Michael Crosby 2015-11-13 14:52:25 -08:00
parent 371226d314
commit c42c9aeb06
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/v1/server.go
View File

@ -169,8 +169,9 @@ func writeContainers(w http.ResponseWriter, e *containerd.Event) error {
} }
var pids []Process var pids []Process
for _, p := range processes { for _, p := range processes {
proc := createProcess(p) if proc := createProcess(p); proc != nil {
pids = append(pids, proc) pids = append(pids, *proc)
}
} }
state.Containers = append(state.Containers, Container{ state.Containers = append(state.Containers, Container{
ID: c.ID(), ID: c.ID(),
@ -184,13 +185,14 @@ func writeContainers(w http.ResponseWriter, e *containerd.Event) error {
return json.NewEncoder(w).Encode(&state) return json.NewEncoder(w).Encode(&state)
} }
func createProcess(in containerd.Process) Process { func createProcess(in containerd.Process) *Process {
pid, err := in.Pid() pid, err := in.Pid()
if err != nil { if err != nil {
logrus.WithField("error", err).Error("get process pid") logrus.WithField("error", err).Error("get process pid")
return nil
} }
process := in.Spec() process := in.Spec()
p := Process{ p := &Process{
Pid: pid, Pid: pid,
Terminal: process.Terminal, Terminal: process.Terminal,
Args: process.Args, Args: process.Args,