Skip to content

Commit

Permalink
Exclude read-timeout from being an error (influxdata#9429)
Browse files Browse the repository at this point in the history
  • Loading branch information
srebhan authored Jun 24, 2021
1 parent c6c3efd commit e4bd01e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions plugins/inputs/dovecot/dovecot.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, qtype stri

c, err := net.DialTimeout(proto, addr, defaultTimeout)
if err != nil {
return fmt.Errorf("enable to connect to dovecot server '%s': %s", addr, err)
return fmt.Errorf("unable to connect to dovecot server '%s': %s", addr, err)
}
defer c.Close()

Expand All @@ -113,7 +113,12 @@ func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, qtype stri
}
var buf bytes.Buffer
if _, err := io.Copy(&buf, c); err != nil {
return fmt.Errorf("copying message failed for dovecot server '%s': %s", addr, err)
// We need to accept the timeout here as reading from the connection will only terminate on EOF
// or on a timeout to happen. As EOF for TCP connections will only be sent on connection closing,
// the only way to get the whole message is to wait for the timeout to happen.
if nerr, ok := err.(net.Error); !ok || !nerr.Timeout() {
return fmt.Errorf("copying message failed for dovecot server '%s': %s", addr, err)
}
}

var host string
Expand Down

0 comments on commit e4bd01e

Please sign in to comment.