Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/spam/spam_verdict_service.rb')
-rw-r--r--app/services/spam/spam_verdict_service.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/services/spam/spam_verdict_service.rb b/app/services/spam/spam_verdict_service.rb
index 68f1135ae28..7de3bad607a 100644
--- a/app/services/spam/spam_verdict_service.rb
+++ b/app/services/spam/spam_verdict_service.rb
@@ -14,7 +14,7 @@ module Spam
end
def execute
- external_spam_check_result = spam_verdict
+ external_spam_check_result = external_verdict
akismet_result = akismet_verdict
# filter out anything we don't recognise, including nils.
@@ -38,7 +38,7 @@ module Spam
end
end
- def spam_verdict
+ def external_verdict
return unless Gitlab::CurrentSettings.spam_check_endpoint_enabled
return if endpoint_url.blank?
@@ -50,17 +50,14 @@ module Spam
# @TODO metrics/logging
# Expecting:
# error: (string or nil)
- # result: (string or nil)
- verdict = json_result[:verdict]
- return unless SUPPORTED_VERDICTS.include?(verdict)
-
+ # verdict: (string or nil)
# @TODO log if json_result[:error]
json_result[:verdict]
rescue *Gitlab::HTTP::HTTP_ERRORS => e
# @TODO: log error via try_post https://gitlab.com/gitlab-org/gitlab/-/issues/219223
Gitlab::ErrorTracking.log_exception(e)
- return
+ nil
rescue
# @TODO log
ALLOW