0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon/logger/fluentd: make error-handling less DRY

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-04-10 12:28:16 +02:00
parent 0dd2b4d577
commit b161616202
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/logger/fluentd/fluentd.go
View file

@ -172,7 +172,7 @@ func parseConfig(cfg map[string]string) (fluent.Config, error) {
loc, err := parseAddress(cfg[addressKey])
if err != nil {
return config, err
return config, errors.Wrapf(err, "invalid fluentd-address (%s)", cfg[addressKey])
}
bufferLimit := defaultBufferLimit
@ -278,11 +278,10 @@ func parseAddress(address string) (*location, error) {
}
protocol := defaultProtocol
givenAddress := address
if urlutil.IsTransportURL(address) {
addr, err := url.Parse(address)
if err != nil {
return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
return nil, err
}
// unix and unixgram socket
if addr.Scheme == "unix" || addr.Scheme == "unixgram" {
@ -301,7 +300,7 @@ func parseAddress(address string) (*location, error) {
host, port, err := net.SplitHostPort(address)
if err != nil {
if !strings.Contains(err.Error(), "missing port in address") {
return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
return nil, err
}
return &location{
protocol: protocol,
@ -313,7 +312,7 @@ func parseAddress(address string) (*location, error) {
portnum, err := strconv.Atoi(port)
if err != nil {
return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
return nil, err
}
return &location{
protocol: protocol,