summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-07-04 22:02:01 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-07-09 21:13:08 +0800
commit3bfe30662436e48d4324b8fac5c1634df4a7cf7f (patch)
tree3f772a44196e249ded23b453b89799095cbcc5d8 /app/workers
parent9286f5b9340f92131c320c231a5fb3e51c23bf04 (diff)
downloadgitlab-ce-3bfe30662436e48d4324b8fac5c1634df4a7cf7f.tar.gz
Resolve Naming/UncommunicativeMethod
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/email_receiver_worker.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index f9f0efb302a..12706613ac2 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -15,14 +15,14 @@ class EmailReceiverWorker
private
- def handle_failure(raw, e)
- Rails.logger.warn("Email can not be processed: #{e}\n\n#{raw}")
+ def handle_failure(raw, error)
+ Rails.logger.warn("Email can not be processed: #{error}\n\n#{raw}")
return unless raw.present?
can_retry = false
reason =
- case e
+ case error
when Gitlab::Email::UnknownIncomingEmail
"We couldn't figure out what the email is for. Please create your issue or comment through the web interface."
when Gitlab::Email::SentNotificationNotFoundError
@@ -42,7 +42,7 @@ class EmailReceiverWorker
"The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member."
when Gitlab::Email::InvalidRecordError
can_retry = true
- e.message
+ error.message
end
if reason