Skip to content
This repository was archived by the owner on Dec 3, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/resque/server/views/working.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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? }
%>

<h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
Expand All @@ -49,7 +49,7 @@
</tr>
<% 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| %>
<tr>
<td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
<% host, pid, queues = worker.to_s.split(':') %>
Expand Down
2 changes: 1 addition & 1 deletion lib/resque/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Resque
Version = VERSION = '1.19.0'
Version = VERSION = '1.19.100' #100+ are downstream patches
end