Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit f6848ae

Browse files
authored
Merge pull request moby#42979 from akerouanton/bump-fluent-logger
vendor: github.com/fluent/fluent-logger-golang v1.8.0
2 parents 0f92cf2 + bd61629 commit f6848ae

File tree

4 files changed

+284
-118
lines changed

4 files changed

+284
-118
lines changed

daemon/logger/fluentd/fluentd.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ func parseConfig(cfg map[string]string) (fluent.Config, error) {
242242
AsyncConnect: asyncConnect,
243243
SubSecondPrecision: subSecondPrecision,
244244
RequestAck: requestAck,
245+
ForceStopAsyncSend: async || asyncConnect,
245246
}
246247

247248
return config, nil

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ github.com/godbus/dbus/v5 c88335c0b1d28a30e7fc76d526a0
103103
github.com/Graylog2/go-gelf 1550ee647df0510058c9d67a45c56f18911d80b8 # v2 branch
104104

105105
# fluent-logger-golang deps
106-
github.com/fluent/fluent-logger-golang b9b7fb02ccfee8ba4e69aa87386820c2bf24fd11 # v1.6.1
106+
github.com/fluent/fluent-logger-golang 0b652e850a9140d0b1db6390d8925d0601e952db # v1.8.0
107107
github.com/philhofer/fwd bb6d471dc95d4fe11e432687f8b70ff496cf3136 # v1.0.0
108108
github.com/tinylib/msgp af6442a0fcf6e2a1b824f70dd0c734f01e817751 # v1.1.0
109109

vendor/github.com/fluent/fluent-logger-golang/README.md

Lines changed: 34 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)