notify/email: wrap all errors for easier debugging #1953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In addition, this commit passes the current context to the TCP dialer and it doesn't log any QUIT errors if the email delivery wasn't successful. Signed-off-by: Simon Pasquier <[email protected]>
stuartnelson3
approved these changes
Jul 9, 2019
mxinden
reviewed
Jul 9, 2019
notify/email/email.go
Outdated
| @@ -112,77 +112,87 @@ func (n *Email) auth(mechs string) (smtp.Auth, error) { | |||
|
|
|||
| // Notify implements the Notifier interface. | |||
| func (n *Email) Notify(ctx context.Context, as ...*types.Alert) (bool, error) { | |||
| // TODO: move the check to the config pacakge. | |||
There was a problem hiding this comment.
Suggested change
| // TODO: move the check to the config pacakge. | |
| // TODO: move the check to the config package. |
Is this supposed to happen in this pull request or a follow up?
There was a problem hiding this comment.
I planned for a follow up PR.
Signed-off-by: Simon Pasquier <[email protected]>
mxinden
approved these changes
Jul 10, 2019
DuskEagle
pushed a commit
to DuskEagle/alertmanager
that referenced
this pull request
Aug 1, 2019
* notify/email: wrap all errors for easier debugging In addition, this commit passes the current context to the TCP dialer and it doesn't log any QUIT errors if the email delivery wasn't successful. Signed-off-by: Simon Pasquier <[email protected]> * Fix typo Signed-off-by: Simon Pasquier <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In addition, this commit passes the current context to the TCP dialer and it doesn't log any QUIT errors if the email delivery wasn't successful.
Related #1944
Related #980