Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dovecot regression in #9415 #9429

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Fix dovecot regression in #9415 #9429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions plugins/inputs/dovecot/dovecot.go
View file
Open in desktop
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