rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 22:46:25 +00:00
Code Issues Releases Wiki Activity

Fix local port check

Browse Source
This commit is contained in:
galal-hussein
2018-07-21 09:14:45 +02:00
committed by Alena Prokharchyk
parent caa2c524a6
commit b71fd3ba35
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/docker.go
View File

@@ -364,11 +364,11 @@ func ReadContainerLogs(ctx context.Context, dClient *client.Client, containerNam
return dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{Follow: follow, ShowStdout: true, ShowStderr: true, Timestamps: false, Tail: tail})
}
func GetContainerLogsStdoutStderr(ctx context.Context, dClient *client.Client, containerName, tail string) (string, error) {
func GetContainerLogsStdoutStderr(ctx context.Context, dClient *client.Client, containerName, tail string, follow bool) (string, error) {
var containerStderr bytes.Buffer
var containerStdout bytes.Buffer
var containerLog string
clogs, logserr := ReadContainerLogs(ctx, dClient, containerName, false, tail)
clogs, logserr := ReadContainerLogs(ctx, dClient, containerName, follow, tail)
if logserr != nil {
logrus.Debug("logserr: %v", logserr)
return containerLog, fmt.Errorf("Failed to get gather logs from container [%s]: %v", containerName, logserr)
@@ -376,7 +376,6 @@ func GetContainerLogsStdoutStderr(ctx context.Context, dClient *client.Client, c
defer clogs.Close()
stdcopy.StdCopy(&containerStdout, &containerStderr, clogs)
containerLog = containerStderr.String()
containerLog = strings.TrimSuffix(containerLog, "\n")
return containerLog, nil
}