Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Memory edit #41

Merged
merged 3 commits into from
Feb 18, 2022
Merged

Memory edit #41

merged 3 commits into from
Feb 18, 2022

Conversation

rmweir
Copy link
Contributor

@rmweir rmweir commented Feb 15, 2022

Small revision of: #40

Issue:
rancher/rancher#36531

Copy link
Contributor

@cbron cbron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change then lgtm

readbuffer.go Outdated
@@ -60,7 +61,7 @@ func (r *readBuffer) Offer(reader io.Reader) error {
}

if r.buf.Len() > MaxBuffer*2 {
logrus.Errorf("remotedialer buffer exceeded, length: %d", r.buf.Len())
logrus.Errorf("remotedialer buffer id=%d exceeded, length: %d", r.id, r.buf.Len())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To keep consistency with past log messages:

Suggested change
logrus.Errorf("remotedialer buffer id=%d exceeded, length: %d", r.id, r.buf.Len())
logrus.Errorf("remotedialer buffer exceeded id=%d, length: %d", r.id, r.buf.Len())

This log seems more of a debug log as it's just stating that
the buffer is being reset and there is nothing to indicate
this is not expected or normal behavior.
@rmweir rmweir merged commit 1b7069d into rancher:master Feb 18, 2022
@cbron cbron mentioned this pull request Feb 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants