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.

Sign up for GitHub

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

Jump to bottom

[20.10 backport] backport fluentd log driver async connect fix #43147

Merged
merged 3 commits into from Jan 20, 2022
Merged

[20.10 backport] backport fluentd log driver async connect fix #43147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6f3add
vendor: github.com/fluent/fluent-logger-golang 1.6.1
sparrc May 25, 2021
81fc02b
vendor: github.com/fluent/fluent-logger-golang v1.8.0
akerouanton Nov 1, 2021
f9df098
fluentd: Turn ForceStopAsyncSend true when async connect is used
akerouanton Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions daemon/logger/fluentd/fluentd.go
View file
Open in desktop
Expand Up @@ -242,6 +242,7 @@ func parseConfig(cfg map[string]string) (fluent.Config, error) {
AsyncConnect: asyncConnect,
SubSecondPrecision: subSecondPrecision,
RequestAck: requestAck,
ForceStopAsyncSend: async || asyncConnect,
}

return config, nil
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@ github.com/godbus/dbus/v5 37bf87eef99d69c4f1d3528bd66e
github.com/Graylog2/go-gelf 1550ee647df0510058c9d67a45c56f18911d80b8 # v2 branch

# fluent-logger-golang deps
github.com/fluent/fluent-logger-golang 7a6c9dcd7f14c2ed5d8c55c11b894e5455ee311b # v1.4.0
github.com/fluent/fluent-logger-golang 0b652e850a9140d0b1db6390d8925d0601e952db # v1.8.0
github.com/philhofer/fwd bb6d471dc95d4fe11e432687f8b70ff496cf3136 # v1.0.0
github.com/tinylib/msgp af6442a0fcf6e2a1b824f70dd0c734f01e817751 # v1.1.0

Expand Down
112 changes: 107 additions & 5 deletions vendor/github.com/fluent/fluent-logger-golang/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.