Browse Source

Fluentd: return "invalid parameter" for invalid config options

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 5 years ago
parent
commit
ad13a2a4ba
1 changed files with 4 additions and 3 deletions
  1. 4 3
      daemon/logger/fluentd/fluentd.go

+ 4 - 3
daemon/logger/fluentd/fluentd.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/logger/loggerutils"
+	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/urlutil"
 	units "github.com/docker/go-units"
 	"github.com/fluent/fluent-logger-golang/fluent"
@@ -71,17 +72,17 @@ func init() {
 func New(info logger.Info) (logger.Logger, error) {
 	loc, err := parseAddress(info.Config[addressKey])
 	if err != nil {
-		return nil, err
+		return nil, errdefs.InvalidParameter(err)
 	}
 
 	tag, err := loggerutils.ParseLogTag(info, loggerutils.DefaultTemplate)
 	if err != nil {
-		return nil, err
+		return nil, errdefs.InvalidParameter(err)
 	}
 
 	extra, err := info.ExtraAttributes(nil)
 	if err != nil {
-		return nil, err
+		return nil, errdefs.InvalidParameter(err)
 	}
 
 	bufferLimit := defaultBufferLimit