rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-23 14:07:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #570 from superseb/debug_loglength

Browse Source 
Fix debug message on count of container log lines
This commit is contained in:
Hussein Galal 2018-05-03 23:12:41 +02:00 committed by GitHub
commit f81e1d5c16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/network.go
View File

@ -406,7 +406,6 @@ func (c *Cluster) runServicePortChecks(ctx context.Context) error {
func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList []string, planeHosts []*hosts.Host, image string, prsMap map[string]v3.PrivateRegistry) error { func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList []string, planeHosts []*hosts.Host, image string, prsMap map[string]v3.PrivateRegistry) error {
var hosts []string var hosts []string
var portCheckLogs []string
var containerStdout bytes.Buffer var containerStdout bytes.Buffer
var containerStderr bytes.Buffer var containerStderr bytes.Buffer
@ -451,7 +450,7 @@ func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList
if err := docker.RemoveContainer(ctx, host.DClient, host.Address, PortCheckContainer); err != nil { if err := docker.RemoveContainer(ctx, host.DClient, host.Address, PortCheckContainer); err != nil {
return err return err
} }
logrus.Debugf("[network] Length of portCheckLogs is [%d] on host: %s", len(portCheckLogs), host.Address) logrus.Debugf("[network] Length of containerLog is [%d] on host: %s", len(containerLog), host.Address)
if len(containerLog) > 0 { if len(containerLog) > 0 {
portCheckLogs := strings.Join(strings.Split(strings.TrimSpace(containerLog), "\n"), ", ") portCheckLogs := strings.Join(strings.Split(strings.TrimSpace(containerLog), "\n"), ", ")
return fmt.Errorf("[network] Port check for ports: [%s] failed on host: [%s]", portCheckLogs, host.Address) return fmt.Errorf("[network] Port check for ports: [%s] failed on host: [%s]", portCheckLogs, host.Address)