Skip to content

Commit 8aa2e0e

Browse files
committed
Merge pull request resque#467 from dolores/bug/dont_display_jobs_that_finished
Fix a display issue when a worker's job is empty and it tries to sort on nil
2 parents 4b0a835 + 27f7bb6 commit 8aa2e0e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/resque/server/views/working.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
workers = resque.working
3232
jobs = workers.collect {|w| w.job }
3333
worker_jobs = workers.zip(jobs)
34-
worker_jobs = worker_jobs.reject { |w, j| w.idle? }
34+
worker_jobs = worker_jobs.reject { |w, j| w.idle? || j.empty? }
3535
%>
3636

3737
<h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
@@ -49,7 +49,7 @@
4949
</tr>
5050
<% end %>
5151

52-
<% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
52+
<% worker_jobs.sort_by {|w, j| j['run_at'] || '' }.each do |worker, job| %>
5353
<tr>
5454
<td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
5555
<% host, pid, queues = worker.to_s.split(':') %>

0 commit comments

Comments
 (0)