kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Improve code style for exception_caused_by_shutdown?

Browse source
This commit is contained in:
Kevin Yank 2014-06-30 12:40:18 +10:00
parent df14b3c616
commit bc63d0bea3
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/sidekiq/middleware/server/retry_jobs.rb
View file

@ -64,10 +64,8 @@ module Sidekiq
# ignore, will be pushed back onto queue during hard_shutdown
raise
rescue Exception => e
if exception_caused_by_shutdown?(e)
# ignore, will be pushed back onto queue during hard_shutdown.
raise Sidekiq::Shutdown
end
# ignore, will be pushed back onto queue during hard_shutdown
raise Sidekiq::Shutdown if exception_caused_by_shutdown?(e)
raise e unless msg['retry']
max_retry_attempts = retry_attempts_from(msg['retry'], @max_retries)
@ -170,11 +168,10 @@ module Sidekiq
def exception_caused_by_shutdown?(e)
# In Ruby 2.1.0 only, check if exception is a result of shutdown.
defined?(e.cause) &&
(
e.cause.class == Sidekiq::Shutdown ||
return false unless defined?(e.cause)
e.cause.instance_of?(Sidekiq::Shutdown) ||
exception_caused_by_shutdown?(e.cause)
)
end
end