api/types: hostconfig: fix LogMode enum

thaJeztah · thaJeztah · commit 6948ab4fa187 · 2021-08-06T19:05:58.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/types/container/host_config.go b/api/types/container/host_config.go
@@ -341,7 +341,7 @@ type LogMode string
 
 // Available logging modes
 const (
-	LogModeUnset            = ""
+	LogModeUnset    LogMode = ""
 	LogModeBlocking LogMode = "blocking"
 	LogModeNonBlock LogMode = "non-blocking"
 )
diff --git a/daemon/logger/loggerutils/cache/local_cache.go b/daemon/logger/loggerutils/cache/local_cache.go
@@ -36,7 +36,7 @@ func WithLocalCache(l logger.Logger, info logger.Info) (logger.Logger, error) {
 		return nil, errors.Wrap(err, "error initializing local log cache driver")
 	}
 
-	if info.Config["mode"] == container.LogModeUnset || container.LogMode(info.Config["mode"]) == container.LogModeNonBlock {
+	if container.LogMode(info.Config["mode"]) == container.LogModeUnset || container.LogMode(info.Config["mode"]) == container.LogModeNonBlock {
 		var size int64 = -1
 		if s, exists := info.Config["max-buffer-size"]; exists {
 			size, err = units.RAMInBytes(s)

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ type LogMode string`
`341`	`341`
`342`	`342`	`// Available logging modes`
`343`	`343`	`const (`
`344`		`- LogModeUnset = ""`
	`344`	`+ LogModeUnset LogMode = ""`
`345`	`345`	`LogModeBlocking LogMode = "blocking"`
`346`	`346`	`LogModeNonBlock LogMode = "non-blocking"`
`347`	`347`	`)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func WithLocalCache(l logger.Logger, info logger.Info) (logger.Logger, error) {`
`36`	`36`	`return nil, errors.Wrap(err, "error initializing local log cache driver")`
`37`	`37`	`}`
`38`	`38`
`39`		`- if info.Config["mode"] == container.LogModeUnset \|\| container.LogMode(info.Config["mode"]) == container.LogModeNonBlock {`
	`39`	`+ if container.LogMode(info.Config["mode"]) == container.LogModeUnset \|\| container.LogMode(info.Config["mode"]) == container.LogModeNonBlock {`
`40`	`40`	`var size int64 = -1`
`41`	`41`	`if s, exists := info.Config["max-buffer-size"]; exists {`
`42`	`42`	`size, err = units.RAMInBytes(s)`