github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kubelet/rkt: Add support for fetching per container log.

pull/6/head
Yifan Gu 2015-08-19 11:58:26 -07:00
parent a927791293
commit 710c34a362
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/rkt/rkt.go
View File

@ -901,12 +901,16 @@ func (r *runtime) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, podStatus
// By default, it returns a snapshot of the container log. Set |follow| to true to // By default, it returns a snapshot of the container log. Set |follow| to true to
// stream the log. Set |follow| to false and specify the number of lines (e.g. // stream the log. Set |follow| to false and specify the number of lines (e.g.
// "100" or "all") to tail the log. // "100" or "all") to tail the log.
// TODO(yifan): Currently, it fetches all the containers' log within a pod. We will //
// be able to fetch individual container's log once https://github.com/coreos/rkt/pull/841 // In rkt runtime's implementation, per container log is get via 'journalctl -M [rkt-$UUID] -u [APP_NAME]'.
// landed. // See https://github.com/coreos/rkt/blob/master/Documentation/commands.md#logging for more details.
func (r *runtime) GetContainerLogs(pod *api.Pod, containerID string, tail string, follow bool, stdout, stderr io.Writer) error { func (r *runtime) GetContainerLogs(pod *api.Pod, containerID string, tail string, follow bool, stdout, stderr io.Writer) error {
unitName := makePodServiceFileName(pod.UID) id, err := parseContainerID(containerID)
cmd := exec.Command("journalctl", "-u", unitName) if err != nil {
return err
}
cmd := exec.Command("journalctl", "-M", fmt.Sprintf("rkt-%s", id.uuid), "-u", id.appName)
if follow { if follow {
cmd.Args = append(cmd.Args, "-f") cmd.Args = append(cmd.Args, "-f")
} }
@ -919,7 +923,7 @@ func (r *runtime) GetContainerLogs(pod *api.Pod, containerID string, tail string
} }
} }
cmd.Stdout, cmd.Stderr = stdout, stderr cmd.Stdout, cmd.Stderr = stdout, stderr
return cmd.Start() return cmd.Run()
} }
// GarbageCollect collects the pods/containers. TODO(yifan): Enforce the gc policy. // GarbageCollect collects the pods/containers. TODO(yifan): Enforce the gc policy.