Return the started time and ctr state with ctr status
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
parent
0741159ce8
commit
819db7d8cc
1 changed files with 30 additions and 8 deletions
|
@ -643,16 +643,38 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
cState := s.runtime.ContainerStatus(c)
|
csr := &pb.ContainerStatusResponse{
|
||||||
created := cState.Created.Unix()
|
|
||||||
|
|
||||||
return &pb.ContainerStatusResponse{
|
|
||||||
Status: &pb.ContainerStatus{
|
Status: &pb.ContainerStatus{
|
||||||
Id: containerName,
|
Id: containerName,
|
||||||
CreatedAt: int64Ptr(created),
|
|
||||||
},
|
},
|
||||||
}, nil
|
}
|
||||||
return nil, nil
|
|
||||||
|
cState := s.runtime.ContainerStatus(c)
|
||||||
|
rStatus := pb.ContainerState_UNKNOWN
|
||||||
|
|
||||||
|
switch cState.Status {
|
||||||
|
case "created":
|
||||||
|
rStatus = pb.ContainerState_CREATED
|
||||||
|
created := cState.Created.Unix()
|
||||||
|
csr.Status.CreatedAt = int64Ptr(created)
|
||||||
|
case "running":
|
||||||
|
rStatus = pb.ContainerState_RUNNING
|
||||||
|
created := cState.Created.Unix()
|
||||||
|
csr.Status.CreatedAt = int64Ptr(created)
|
||||||
|
started := cState.Started.Unix()
|
||||||
|
csr.Status.StartedAt = int64Ptr(started)
|
||||||
|
case "stopped":
|
||||||
|
// TODO: Get the exit time
|
||||||
|
rStatus = pb.ContainerState_EXITED
|
||||||
|
created := cState.Created.Unix()
|
||||||
|
csr.Status.CreatedAt = int64Ptr(created)
|
||||||
|
started := cState.Started.Unix()
|
||||||
|
csr.Status.StartedAt = int64Ptr(started)
|
||||||
|
}
|
||||||
|
|
||||||
|
csr.Status.State = &rStatus
|
||||||
|
|
||||||
|
return csr, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Exec executes the command in the container.
|
// Exec executes the command in the container.
|
||||||
|
|
Loading…
Reference in a new issue