resque 1.10.0 → 1.11.0

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.11.0 (2010-08-23)
+
+* Web UI: Group /workers page by hostnames
+
 ## 1.10.0 (2010-08-23)
 
 * Support redis:// string format in `Resque.redis=`

data/lib/resque/server.rb

@@ -80,6 +80,21 @@ module Resque
         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

data/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 %>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.10.0'
+  Version = VERSION = '1.11.0'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: false
   segments: 
   - 1
-  - 10
+  - 11
   - 0
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2011-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 8
@@ -35,9 +38,11 @@ dependencies:
   name: vegas
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 1
@@ -49,9 +54,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 9
@@ -63,9 +70,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
@@ -145,23 +154,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Resque is a Redis-backed queueing system.