Skip to content

feat: #4273 - courier http channel - Include error response from email service provider in courier logs #4274

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

Open
hvsharma wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

feat: #4273 - courier http channel - Include error response from email service provider in courier logs #4274

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
7 changes: 5 additions & 2 deletions courier/http_channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package courier

import (
"bytes"
"context"
"encoding/json"
"fmt"
Expand Down Expand Up @@ -105,9 +106,11 @@ func (c *httpChannel) Dispatch(ctx context.Context, msg Message) (err error) {
}

err = errors.Errorf(
"unable to dispatch mail delivery because upstream server replied with status code %d",
res.StatusCode,
"unable to dispatch mail delivery because upstream server replied with status code %d and body: %s",
res.StatusCode,
bytes.NewBuffer(x.MustReadAll(res.Body)).String(),
Copy link
Copy Markdown
Member

@aeneasr aeneasr Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please properly handle the error of the stream reader here (in this case ignore the error and log an empty body) as otherwise this can panic. Otherwise LGTM. Also you don‘t need to create a buffer.

Copy link
Copy Markdown
Contributor

@alnr alnr Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're also never closing the response body here. And we must have an io.LimitReader to avoid reading unbounded data.

)

logger.
WithError(err).
Error("sending mail via HTTP failed.")
Expand Down