[refactor] get exit code for container

Signed-off-by: Wang Xu <gnawux@gmail.com>

Author: gnawux

daemon/exec.go

@@ -18,7 +18,7 @@ func (daemon *Daemon) ExitCode(containerId, execId string) (int, error) {
 
 	glog.V(1).Infof("Get Exec Code for container %s", containerId)
 
-	code, err := p.GetExecExitCode(id, execId)
+	code, err := p.GetExitCode(id, execId)
 	return int(code), err
 }
 

daemon/pod/container.go

@@ -338,6 +338,16 @@ func (c *Container) StatusString() string {
 	return strings.Join([]string{s.ContainerID, s.ContainerName, s.PodID, s.Status}, ":")
 }
 
+func (c *Container) GetExitCode() (uint8, error) {
+	c.status.RLock()
+	code := uint8(c.status.ExitCode)
+	if c.status.Killed {
+		code = uint8(137)
+	}
+	c.status.RUnlock()
+	return code, nil
+}
+
 func (c *Container) HasTty() bool {
 	return c.spec.Tty
 }

daemon/pod/pod.go

@@ -215,6 +215,18 @@ func (p *XPod) SandboxStatusString() string {
 	return ""
 }
 
+func (p *XPod) GetExitCode(cid, execId string) (uint8, error) {
+	if execId != "" {
+		return p.GetExecExitCode(cid, execId)
+	}
+	if c, ok := p.containers[cid]; ok {
+		return c.GetExitCode()
+	}
+	err := fmt.Errorf("cannot find container %s", cid)
+	p.Log(ERROR, "failed to get exit code: %v", err)
+	return 255, err
+}
+
 func (p *XPod) ContainerBriefStatus(cid string) *apitypes.ContainerListResult {
 	if c, ok := p.containers[cid]; ok {
 		return c.BriefStatus()