diff --git a/daemon/logger/fluentd/fluentd.go b/daemon/logger/fluentd/fluentd.go index c15da377abe6128bb4a48c7d6bdd258b9dc4e3c2..96281359354578d15da254402c2f24f468e31aa1 100644 --- a/daemon/logger/fluentd/fluentd.go +++ b/daemon/logger/fluentd/fluentd.go @@ -39,21 +39,21 @@ type location struct { const ( name = "fluentd" - defaultProtocol = "tcp" + defaultBufferLimit = 1024 * 1024 defaultHost = "127.0.0.1" defaultPort = 24224 - defaultBufferLimit = 1024 * 1024 + defaultProtocol = "tcp" // logger tries to reconnect 2**32 - 1 times // failed (and panic) after 204 years [ 1.5 ** (2**32 - 1) - 1 seconds] - defaultRetryWait = 1000 defaultMaxRetries = math.MaxInt32 + defaultRetryWait = 1000 addressKey = "fluentd-address" + asyncConnectKey = "fluentd-async-connect" bufferLimitKey = "fluentd-buffer-limit" - retryWaitKey = "fluentd-retry-wait" maxRetriesKey = "fluentd-max-retries" - asyncConnectKey = "fluentd-async-connect" + retryWaitKey = "fluentd-retry-wait" subSecondPrecisionKey = "fluentd-sub-second-precision" ) @@ -195,11 +195,12 @@ func ValidateLogOpt(cfg map[string]string) error { case "labels": case "labels-regex": case "tag": + case addressKey: + case asyncConnectKey: case bufferLimitKey: - case retryWaitKey: case maxRetriesKey: - case asyncConnectKey: + case retryWaitKey: case subSecondPrecisionKey: // Accepted default: