Merge pull request #14 from feiskyer/fix-hyper-logs

feiskyer · feiskyer · commit 5bad8a38a6db · 2015-10-21T16:16:15.000+08:00
Fix hyper logs
diff --git a/pkg/kubelet/hyper/hyper.go b/pkg/kubelet/hyper/hyper.go
@@ -863,10 +863,10 @@ func (r *runtime) GetContainerLogs(pod *api.Pod, containerID kubecontainer.Conta
 	if logOptions.Follow {
 		args = append(args, "--follow")
 	}
-	if *logOptions.SinceSeconds != 0 {
+	if logOptions.SinceSeconds != nil && *logOptions.SinceSeconds != 0 {
 		args = append(args, fmt.Sprintf("--since=%d", *logOptions.SinceSeconds))
 	}
-	if *logOptions.TailLines != 0 {
+	if logOptions.TailLines != nil && *logOptions.TailLines != 0 {
 		args = append(args, fmt.Sprintf("--tail=%d", *logOptions.TailLines))
 	}
 	if logOptions.Timestamps {

Original file line number	Diff line number	Diff line change
`@@ -863,10 +863,10 @@ func (r runtime) GetContainerLogs(pod api.Pod, containerID kubecontainer.Conta`
`863`	`863`	`if logOptions.Follow {`
`864`	`864`	`args = append(args, "--follow")`
`865`	`865`	`}`
`866`		`- if *logOptions.SinceSeconds != 0 {`
	`866`	`+ if logOptions.SinceSeconds != nil && *logOptions.SinceSeconds != 0 {`
`867`	`867`	`args = append(args, fmt.Sprintf("--since=%d", *logOptions.SinceSeconds))`
`868`	`868`	`}`
`869`		`- if *logOptions.TailLines != 0 {`
	`869`	`+ if logOptions.TailLines != nil && *logOptions.TailLines != 0 {`
`870`	`870`	`args = append(args, fmt.Sprintf("--tail=%d", *logOptions.TailLines))`
`871`	`871`	`}`
`872`	`872`	`if logOptions.Timestamps {`