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

Merge pull request #2324 from jhadvig/raw_logs 

Setting RawTerminal attribute in LogOptions to false
pull/6/head
Clayton Coleman 2014-11-12 12:16:51 -05:00
parent 76b6188f82 f2f1708687
commit b4d8b7b830
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/dockertools/docker.go
View File

@ -334,6 +334,7 @@ func GetRecentDockerContainersWithNameAndUUID(client DockerInterface, podFullNam
// By default the function will return snapshot of the container log // By default the function will return snapshot of the container log
// Log streaming is possible if 'follow' param is set to true // Log streaming is possible if 'follow' param is set to true
// Log tailing is possible when number of tailed lines are set and only if 'follow' is false // Log tailing is possible when number of tailed lines are set and only if 'follow' is false
// TODO: Make 'RawTerminal' option flagable.
func GetKubeletDockerContainerLogs(client DockerInterface, containerID, tail string, follow bool, stdout, stderr io.Writer) (err error) { func GetKubeletDockerContainerLogs(client DockerInterface, containerID, tail string, follow bool, stdout, stderr io.Writer) (err error) {
opts := docker.LogsOptions{ opts := docker.LogsOptions{
Container: containerID, Container: containerID,
@ -342,7 +343,7 @@ func GetKubeletDockerContainerLogs(client DockerInterface, containerID, tail str
OutputStream: stdout, OutputStream: stdout,
ErrorStream: stderr, ErrorStream: stderr,
Timestamps: true, Timestamps: true,
RawTerminal: true, RawTerminal: false,
Follow: follow, Follow: follow,
} }