Repository navigation
fix(logging): pass the fluentd default retry wait in milliseconds - #5321
Open
ogulcanaydogan wants to merge 1 commit into
Open
ogulcanaydogan wants to merge 1 commit into
ogulcanaydogan wants to merge 1 commit into
Conversation
The fluent logger expects RetryWait in milliseconds. A set fluentd-retry-wait was converted with Milliseconds(), but the default was int(1000 * time.Millisecond), which is 1000000000. Without the option the retry delay was far above the logger's maximum, so it always waited the maximum instead of one second. Use the default in milliseconds and have the tests check it. Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #5320
The default retry wait was
int(defaultRetryWait), a nanosecond count of 1000000000, while the fluent logger takes milliseconds and a user-set value is already converted withMilliseconds(). Without the option, reconnects waited the logger's maximum (60 s) instead of 1 s. The default now goes throughMilliseconds()as well.TestParseFluentdConfigexpectedint(defaultRetryWait), which repeated the bug. It now expects milliseconds, and the default case asserts the literal1000. The tests fail without the change and pass with it. golangci-lint is clean.