From 8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 24 Sep 2018 09:22:29 +0200 Subject: Idiomatic error handling for app/e*.go (#9426) --- app/email.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/email.go') diff --git a/app/email.go b/app/email.go index eefe83a81..143d4a052 100644 --- a/app/email.go +++ b/app/email.go @@ -291,6 +291,11 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, senderUserId return } rateLimited, result, err := a.EmailRateLimiter.RateLimit(senderUserId, len(invites)) + if err != nil { + a.Log.Error("Error rate limiting invite email.", mlog.String("user_id", senderUserId), mlog.String("team_id", team.Id), mlog.Err(err)) + return + } + if rateLimited { a.Log.Error("Invite emails rate limited.", mlog.String("user_id", senderUserId), @@ -298,9 +303,6 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, senderUserId mlog.String("retry_after", result.RetryAfter.String()), mlog.Err(err)) return - } else if err != nil { - a.Log.Error("Error rate limiting invite email.", mlog.String("user_id", senderUserId), mlog.String("team_id", team.Id), mlog.Err(err)) - return } for _, invite := range invites { -- cgit v1.2.3-1-g7c22