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

Polish #1761

Browse source
This commit is contained in:
Mike Perham 2014-06-04 20:52:22 -07:00
parent 0aa2386cce
commit 92c855383e
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/sidekiq/api.rb
View file

@ -206,13 +206,8 @@ module Sidekiq
# Unwrap known wrappers so they show up in a human-friendly manner in the Web UI
@klass ||= case klass
when /\ASidekiq::Extensions::Delayed/
begin
(target, method, _) = YAML.load(args[0])
safe_load(args[0], klass) do |target, method, _|
"#{target}.#{method}"
rescue ::ArgumentError => ex
Sidekiq.logger.error ex.message
Sidekiq.logger.error ex.backtrace.join("\n") unless ex.backtrace.nil?
klass
end
when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
args[0]
@ -225,13 +220,8 @@ module Sidekiq
# Unwrap known wrappers so they show up in a human-friendly manner in the Web UI
@args ||= case klass
when /\ASidekiq::Extensions::Delayed/
begin
(_, _, arg) = YAML.load(args[0])
safe_load(args[0], args) do |_, _, arg|
arg
rescue ::ArgumentError => ex
Sidekiq.logger.error ex.message
Sidekiq.logger.error ex.backtrace.join("\n") unless ex.backtrace.nil?
args
end
when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
args[1..-1]
@ -272,6 +262,19 @@ module Sidekiq
def [](name)
@item.__send__(:[], name)
end
private
def safe_load(content, default)
begin
yield *YAML.load(content)
rescue ::ArgumentError => ex
# #1761 in dev mode, it's possible to have jobs enqueued which haven't been loaded into
# memory yet so the YAML can't be loaded.
Sidekiq.logger.warn "Unable to load YAML: #{ex.message}" unless Sidekiq.options[:environment] == 'development'
default
end
end
end
class SortedEntry < Job