Browse code

Fluentd: return "invalid parameter" for invalid config options

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/01/02 20:20:02
Showing 1 changed files
... ...
@@ -13,6 +13,7 @@ import (
13 13
 
14 14
 	"github.com/docker/docker/daemon/logger"
15 15
 	"github.com/docker/docker/daemon/logger/loggerutils"
16
+	"github.com/docker/docker/errdefs"
16 17
 	"github.com/docker/docker/pkg/urlutil"
17 18
 	units "github.com/docker/go-units"
18 19
 	"github.com/fluent/fluent-logger-golang/fluent"
... ...
@@ -71,17 +72,17 @@ func init() {
71 71
 func New(info logger.Info) (logger.Logger, error) {
72 72
 	loc, err := parseAddress(info.Config[addressKey])
73 73
 	if err != nil {
74
-		return nil, err
74
+		return nil, errdefs.InvalidParameter(err)
75 75
 	}
76 76
 
77 77
 	tag, err := loggerutils.ParseLogTag(info, loggerutils.DefaultTemplate)
78 78
 	if err != nil {
79
-		return nil, err
79
+		return nil, errdefs.InvalidParameter(err)
80 80
 	}
81 81
 
82 82
 	extra, err := info.ExtraAttributes(nil)
83 83
 	if err != nil {
84
-		return nil, err
84
+		return nil, errdefs.InvalidParameter(err)
85 85
 	}
86 86
 
87 87
 	bufferLimit := defaultBufferLimit