diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
| commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
| tree | dc4d20fe6064752c0bd323187252c77e0a89144b /lib/gitlab/mailgun | |
| parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'lib/gitlab/mailgun')
| -rw-r--r-- | lib/gitlab/mailgun/webhook_processors/failure_logger.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/mailgun/webhook_processors/failure_logger.rb b/lib/gitlab/mailgun/webhook_processors/failure_logger.rb index a7a85bd1672..fa72abf1311 100644 --- a/lib/gitlab/mailgun/webhook_processors/failure_logger.rb +++ b/lib/gitlab/mailgun/webhook_processors/failure_logger.rb @@ -5,11 +5,12 @@ module Gitlab module WebhookProcessors class FailureLogger < Base def execute - log_failure if permanent_failure? || temporary_failure_over_threshold? + log_failure if permanent_failure_over_threshold? || temporary_failure_over_threshold? end - def permanent_failure? - payload['event'] == 'failed' && payload['severity'] == 'permanent' + def permanent_failure_over_threshold? + payload['event'] == 'failed' && payload['severity'] == 'permanent' && + Gitlab::ApplicationRateLimiter.throttled?(:permanent_email_failure, scope: payload['recipient']) end def temporary_failure_over_threshold? |