diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-09-24 09:22:29 +0200 |
|---|---|---|
| committer | Sudheer <sudheer.105@gmail.com> | 2018-09-24 12:52:29 +0530 |
| commit | 8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e (patch) | |
| tree | 33badb2352d3917cb40ec5cac402768e2b15cff8 /app/email.go | |
| parent | 74c92237c04ff290770469be516102c896710e12 (diff) | |
| download | chat-8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e.tar.gz chat-8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e.tar.bz2 chat-8898d7aab9565c48162c5cf16bfdf2f6f74cdb1e.zip | |
Idiomatic error handling for app/e*.go (#9426)
Diffstat (limited to 'app/email.go')
| -rw-r--r-- | app/email.go | 8 |
1 files changed, 5 insertions, 3 deletions
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 { |