diff --git a/lib/resque/server/views/working.erb b/lib/resque/server/views/working.erb index 6165cfdd4..58b6f6391 100644 --- a/lib/resque/server/views/working.erb +++ b/lib/resque/server/views/working.erb @@ -31,7 +31,7 @@ workers = resque.working jobs = workers.collect {|w| w.job } worker_jobs = workers.zip(jobs) - worker_jobs = worker_jobs.reject { |w, j| w.idle? } + worker_jobs = worker_jobs.reject { |w, j| w.idle? || j.empty? } %>

<%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working

@@ -49,7 +49,7 @@ <% end %> - <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %> + <% worker_jobs.sort_by {|w, j| j['run_at'] || '' }.each do |worker, job| %> <%= state %> <% host, pid, queues = worker.to_s.split(':') %> diff --git a/lib/resque/version.rb b/lib/resque/version.rb index 40e013a90..56deb75a5 100644 --- a/lib/resque/version.rb +++ b/lib/resque/version.rb @@ -1,3 +1,3 @@ module Resque - Version = VERSION = '1.19.0' + Version = VERSION = '1.19.100' #100+ are downstream patches end