From c42c9aeb062b5e146d328e6d32464df5d858a625 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 13 Nov 2015 14:52:25 -0800 Subject: [PATCH] Return nil processes with no pid --- api/v1/server.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/api/v1/server.go b/api/v1/server.go index 846c3594f..1c011df8b 100644 --- a/api/v1/server.go +++ b/api/v1/server.go @@ -169,8 +169,9 @@ func writeContainers(w http.ResponseWriter, e *containerd.Event) error { } var pids []Process for _, p := range processes { - proc := createProcess(p) - pids = append(pids, proc) + if proc := createProcess(p); proc != nil { + pids = append(pids, *proc) + } } state.Containers = append(state.Containers, Container{ ID: c.ID(), @@ -184,13 +185,14 @@ func writeContainers(w http.ResponseWriter, e *containerd.Event) error { return json.NewEncoder(w).Encode(&state) } -func createProcess(in containerd.Process) Process { +func createProcess(in containerd.Process) *Process { pid, err := in.Pid() if err != nil { logrus.WithField("error", err).Error("get process pid") + return nil } process := in.Spec() - p := Process{ + p := &Process{ Pid: pid, Terminal: process.Terminal, Args: process.Args,