Web UI: Group /workers page by hostnames

Author: defunkt

lib/resque/server.rb

@@ -80,6 +80,21 @@ def show_args(args)
         Array(args).map { |a| a.inspect }.join("\n")
       end
 
+      def worker_hosts
+        @worker_hosts ||= worker_hosts!
+      end
+
+      def worker_hosts!
+        hosts = Hash.new { [] }
+
+        Resque.workers.each do |worker|
+          host, _ = worker.to_s.split(':')
+          hosts[host] += [worker.to_s]
+        end
+
+        hosts
+      end
+
       def partial?
         @partial
       end

lib/resque/server/views/workers.erb

@@ -1,3 +1,5 @@
+<% @subtabs = worker_hosts.keys.sort unless worker_hosts.size == 1 %>
+
 <% if params[:id] && worker = Resque::Worker.find(params[:id]) %>
 
   <h1>Worker <%= worker %></h1>
@@ -34,13 +36,19 @@
     </tr>
   </table>
 
-<% elsif params[:id] %>
+<% elsif params[:id] && !worker_hosts.keys.include?(params[:id]) && params[:id] != 'all' %>
 
 <h1>Worker doesn't exist</h1>
 
-<% else %>
+<% elsif worker_hosts.size == 1 || params[:id] %>
 
-  <h1 class='wi'><%= resque.workers.size %> Workers</h1>
+  <% if worker_hosts.size == 1 || params[:id] == 'all' %>
+    <% workers = Resque.workers %>
+  <% else %>
+    <% workers = worker_hosts[params[:id]].map { |id| Resque::Worker.find(id) } %>
+  <% end %>
+
+  <h1 class='wi'><%= workers.size %> Workers</h1>
   <p class='intro'>The workers listed below are all registered as active on your system.</p>
   <table class='workers'>
     <tr>
@@ -49,7 +57,7 @@
       <th>Queues</th>
       <th>Processing</th>
     </tr>
-    <% for worker in (workers = resque.workers.sort_by { |w| w.to_s }) %>
+    <% for worker in (workers = workers.sort_by { |w| w.to_s }) %>
     <tr class="<%=state = worker.state%>">
       <td class='icon'><img src="<%=u state %>.png" alt="<%= state %>" title="<%= state %>"></td>
 
@@ -75,4 +83,27 @@
     <% end %>
   </table>
   <%=poll%>
+
+<% else %>
+
+  <h1 class='wi'>Workers</h1>
+  <p class='intro'>The hostnames below all have registered workers. Select a hostname to view its workers, or "all" to see all workers.</p>
+  <table class='queues'>
+    <tr>
+      <th>Hostname</th>
+      <th>Workers</th>
+    </tr>
+    <% for hostname, workers in worker_hosts %>
+    <tr>
+      <td class='queue'><a class="queue" href="<%= url "workers/#{hostname}" %>"><%= hostname %></a></td>
+      <td class='size'><%= workers.size %></td>
+    </tr>
+    <% end %>
+    <tr class="failed">
+      <td class='queue failed'><a class="queue" href="<%= url "workers/all" %>">all workers</a></td>
+      <td class='size'><%= Resque.workers.size %></td>
+    </tr>
+  </table>
+
+
 <% end %>