resque 1.0.0 → 1.1.0

data/HISTORY.md

@@ -1,3 +1,10 @@
-## 0.1.0 (2009-11-02)
+## 1.1.0 (2009-11-04)
+
+* Bugfix: Broken ERB tag in failure UI
+* Bugfix: Save the worker's ID, not the worker itself, in the failure module
+* Redesigned the sinatra web interface
+* Added option to clear failed jobs
+
+## 1.0.0 (2009-11-03)
 
 * First release.

data/README.markdown

@@ -365,7 +365,7 @@ The Front End
 Resque comes with a Sinatra-based front end for seeing what's up with
 your queue.
 
-![The Front End](http://img.skitch.com/20091102-rpekt191w28xfhwyussru44nsw.png)
+![The Front End](http://img.skitch.com/20091104-tqh5pgkwgbskjbk7qbtmpesnyw.jpg)
 
 ## Standalone
 
@@ -619,6 +619,69 @@ processed in the background.
 Try it out by looking at the README, found at `examples/demo/README.markdown`.
 
 
+Monitoring
+----------
+
+If you're using god to monitor Resque, we have provided example
+configs in `examples/god/`. One is for starting / stopping workers,
+the other is for killing workers that have been running too long.
+
+
+Development
+-----------
+
+Want to hack on Resque?
+
+First clone the repo and run the tests:
+
+    git clone git://github.com/defunkt/resque.git
+    cd resque
+    rake test
+
+If the tests do not pass make sure you have Redis installed
+correctly (though we make an effort to tell you if we feel this is the
+case). The tests attempt to start an isolated instance of Redis to
+run against.
+
+Also make sure you've installed all the depenedencies correctly. For
+example, try loading the `redis-namespace` gem after you've installed
+it:
+
+    $ irb
+    >> require 'rubygems'
+    => true
+    >> require 'redis/namespace'
+    => true
+
+If you get an error requiring any of the dependencies, you may have
+failed to install them or be seeing load path issues.
+
+Feel free to ping the mailing list with your problem and we'll try to
+sort it out.
+
+
+Contributing
+------------
+
+Once you've made your great commits:
+
+1. [Fork](fk) Resque
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. Create an [Issue](is) with a link to your branch
+5. That's it!
+
+
+Mailing List
+------------
+
+To join the list simply send an email to <resque@librelist.com>. This
+will subscribe you and send you information about your subscription,
+include unsubscribe information.
+
+The archive can be found at <http://librelist.com/browser/>.
+
+
 Meta
 ----
 
@@ -636,3 +699,5 @@ Author
 Chris Wanstrath :: chris@ozmm.org :: @defunkt
 
 [0]: http://github.com/blog/542-introducing-resque
+[fk]: http://help.github.com/forking/
+[is]: http://github.com/defunkt/resque/issues

data/examples/demo/app.rb

@@ -1,4 +1,4 @@
-require 'sinatra'
+require 'sinatra/base'
 require 'resque'
 require 'job'
 

data/examples/god/resque.god

@@ -0,0 +1,52 @@
+rails_env   = ENV['RAILS_ENV']  || "production"
+rails_root  = ENV['RAILS_ROOT'] || "/data/github/current"
+num_workers = rails_env == 'production' ? 5 : 2
+
+num_workers.times do |num|
+  God.watch do |w|
+    w.name     = "resque-#{num}"
+    w.group    = 'resque'
+    w.interval = 30.seconds
+    w.start    = "env QUEUE=critical,high,low /usr/bin/rake -f #{rails_root}/Rakefile #{rails_env} resque:work"
+
+    w.uid = 'git'
+    w.gid = 'git'
+
+    # retart if memory gets too high
+    w.transition(:up, :restart) do |on|
+      on.condition(:memory_usage) do |c|
+        c.above = 350.megabytes
+        c.times = 2
+      end
+    end
+
+    # determine the state on startup
+    w.transition(:init, { true => :up, false => :start }) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+      end
+    end
+
+    # determine when process has finished starting
+    w.transition([:start, :restart], :up) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+        c.interval = 5.seconds
+      end
+
+      # failsafe
+      on.condition(:tries) do |c|
+        c.times = 5
+        c.transition = :start
+        c.interval = 5.seconds
+      end
+    end
+
+    # start if process is not running
+    w.transition(:up, :start) do |on|
+      on.condition(:process_running) do |c|
+        c.running = false
+      end
+    end
+  end
+end

data/examples/god/stale.god

@@ -0,0 +1,26 @@
+# This will ride alongside god and kill any rogue stale worker
+# processes. Their sacrifice is for the greater good.
+
+WORKER_TIMEOUT = 60 * 10 # 10 minutes
+
+Thread.new do
+  loop do
+    begin
+      `ps -e -o pid,command | grep [r]esque`.split("\n").each do |line|
+        parts   = line.split(' ')
+        next if parts[-2] != "at"
+        started = parts[-1].to_i
+        elapsed = Time.now - Time.at(started)
+
+        if elapsed >= WORKER_TIMEOUT
+          ::Process.kill('USR1', parts[0].to_i)
+        end
+      end
+    rescue
+      # don't die because of stupid exceptions
+      nil
+    end
+
+    sleep 30
+  end
+end

data/lib/resque/failure.rb

@@ -53,5 +53,11 @@ module Resque
     def self.url
       backend.url
     end
+    
+    # Clear all failure jobs
+    def self.clear
+      backend.clear
+    end
+    
   end
 end

data/lib/resque/failure/base.rb

@@ -44,6 +44,10 @@ module Resque
       # A URL where someone can go to view failures.
       def self.url
       end
+      
+      # Clear all failure objects
+      def self.clear
+      end
 
       # Logging!
       def log(message)

data/lib/resque/failure/redis.rb

@@ -9,7 +9,7 @@ module Resque
           :payload   => payload,
           :error     => exception.to_s,
           :backtrace => exception.backtrace,
-          :worker    => worker,
+          :worker    => worker.to_s,
           :queue     => queue
         }
         data = Resque.encode(data)
@@ -23,6 +23,11 @@ module Resque
       def self.all(start = 0, count = 1)
         Resque.list_range(:failed, start, count)
       end
+      
+      def self.clear
+        Resque.redis.delete('resque:failed')
+      end
+      
     end
   end
 end

data/lib/resque/server.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'erb'
 require 'resque'
+require 'resque/version'
 
 module Resque
   class Server < Sinatra::Base
@@ -80,13 +81,23 @@ module Resque
       ensure
         @partial = false
       end
+      
+      def poll
+        if @polling
+          text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
+        else
+          text = "<a href='#{url(request.path_info)}.poll' rel='poll'>Live Poll</a>"
+        end
+        "<p class='poll'>#{text}</p>"
+      end
+      
     end
 
-    def show(page)
+    def show(page, layout = true)
       begin
-        erb page.to_sym, {}, :resque => Resque
+        erb page.to_sym, {:layout => layout}, :resque => Resque
       rescue Errno::ECONNREFUSED
-        erb :error, {}, :error => "Can't connect to Redis! (#{Resque.redis.server})"
+        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis.server})"
       end
     end
 
@@ -104,6 +115,14 @@ module Resque
         show page
       end
     end
+    
+    %w( overview workers ).each do |page|
+      get "/#{page}.poll" do
+        content_type "text/plain"
+        @polling = true
+        show(page.to_sym, false).gsub(/\s{1,}/, ' ')
+      end
+    end
 
     get "/failed" do
       if Resque::Failure.url
@@ -112,9 +131,10 @@ module Resque
         show :failed
       end
     end
-
-    get "/failed/:id" do
-      show :failed
+    
+    post "/failed/clear" do
+      Resque::Failure.clear
+      redirect u('failed')
     end
 
     get "/stats" do

data/lib/resque/server/public/ranger.js

@@ -4,4 +4,18 @@ $(function() {
     $(this).next().toggle()
     return false
   })
+  
+  $('a[rel=poll]').click(function() {
+    var href = $(this).attr('href')
+    $(this).parent().text('Starting...')
+    $("#main").addClass('polling')
+    setInterval(function() {
+      $.ajax({dataType:'text', type:'get', url:href, success:function(data) { 
+        $('#main').html(data) 
+        $('#main .time').relatizeDate()
+      }})
+    }, 2 * 1000)
+    return false
+  })
+    
 })

data/lib/resque/server/public/reset.css

@@ -14,7 +14,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	font-style: normal;
 	font-size: 100%;
 	font-family: inherit;
-	vertical-align: baseline;
 }
 
 :focus {
@@ -23,8 +22,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 
 body {
 	line-height: 1;
-	color: black;
-	background: white;
 }
 
 ul {

data/lib/resque/server/public/style.css

@@ -1,67 +1,75 @@
-body {
-    margin: 0;
-    /* font: normal 12px/1.5em "Helvetica Neue", Helvetica, Arial, sans-serif;         */
-}
-h1, h2, h3, h4, h5 {
-    color: #333;
-    font: normal 12px/1.5em "Helvetica Neue", Helvetica, Arial, sans-serif;    
-    text-shadow: 1px 1px #ddd;
-}
-h1 {
-    font-size: 1.5em;
-}
-h2 {
-    font-size: 1.0em;
-}
-h3 {
-    font-size: 0.7em;
-}
-table {
-    margin-bottom: 50px;
-    border-collapse: collapse;     
-}
-th, td {
-    padding: 4px;
-    border-bottom: 1px solid #eee;
+html { background:#efefef; font-family:Arial, Verdana, sans-serif; font-size:13px; }
+body { padding:0; margin:0; }
 
-}
-td {
-    padding: 5px 15px 5px 15px;
-}
-th {
-    color: #666;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: bold;
-    text-align: left;
-    font-size: .9em;
-    padding: 0 15px 5px 15px;    
-}
-a {
-    color: #59768A;
-    text-decoration: none;
-    font-size: .9em;
-}
-a:hover {
-    color: #000;
-    background-color: #e0f3ff;
-}
-a.queue {
-    text-transform: uppercase;
-}
-code {
-    font-size: 1.2em;
-}
+.header { background:#000; padding:8px 5% 0 5%; border-bottom:1px solid #444;border-bottom:5px solid #ce1212;}
+.header h1 { color:#333; font-size:90%; font-weight:bold; margin-bottom:6px;}
+.header ul li { display:inline;}
+.header ul li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block;  padding:8px; -webkit-border-top-right-radius:6px; -webkit-border-top-left-radius:6px; }
+.header ul li a:hover { background:#333;}
+.header ul li.current a { background:#ce1212; font-weight:bold; color:#fff;}
 
-#logo {
-    float: right;
-    font-family: Collegiate, "Helvetica Neue", Helvetica, Arial, sans-serif;
-    text-shadow: #0c0c0c 4px 4px 8px;   
-    font-size: 1.6em;
-    padding-right: 20px;
-    letter-spacing: 3px;
-    color: #333;
-}
+.subnav { padding:2px 5% 7px 5%; background:#ce1212; font-size:90%;}
+.subnav li { display:inline;}
+.subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#dd5b5b; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
+.subnav li.current a { background:#fff; font-weight:bold; color:#ce1212;}
+.subnav li a:active { background:#b00909;}
 
-#main {
-    margin: 10px;
-}
+#main { padding:10px 5%; background:#fff; overflow:hidden; }
+#main .logo { float:right; margin:10px;}
+#main span.hl { background:#efefef; padding:2px;}
+#main h1 { margin:10px 0; font-size:190%; font-weight:bold; color:#ce1212;}
+#main h2 { margin:10px 0; font-size:130%;}
+#main table { width:100%; margin:10px 0;}
+#main table tr td, #main table tr th { border:1px solid #ccc; padding:6px;}
+#main table tr th { background:#efefef; color:#888; font-size:80%; font-weight:bold;}
+#main table tr td.no-data { text-align:center; padding:40px 0; color:#999; font-style:italic; font-size:130%;}
+#main a { color:#111;}
+#main p { margin:5px 0;}
+#main p.intro { margin-bottom:15px; font-size:85%; color:#999; margin-top:0; line-height:1.3;}
+#main h1.wi { margin-bottom:5px;}
+#main p.sub { font-size:95%; color:#999;}
+
+#main table.queues { width:40%;}
+#main table.queues td.queue { font-weight:bold; width:50%;}
+#main table.queues tr.failed td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
+#main table.queues tr.failed td a{  color:#d37474;}
+
+#main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
+#main table.jobs td.args{ width:50%;}
+
+#main table.workers td.icon {width:1%; background:#efefef;text-align:center;}
+#main table.workers td.where { width:25%;}
+#main table.workers td.queues { width:35%;}
+#main .queue-tag { background:#b1d2e9; padding:2px; margin:0 3px; font-size:80%; text-decoration:none; text-transform:uppercase; font-weight:bold; color:#3274a2; -webkit-border-radius:4px; -moz-border-radius:4px;}
+#main table.workers td.queues.queue { width:10%;}
+#main table.workers td.process { width:35%;}
+#main table.workers td.process span.waiting { color:#999; font-size:90%;}
+#main table.workers td.process small { font-size:80%; margin-left:5px;}
+#main table.workers td.process code { font-family:Monaco, "Courier New", monospace; font-size:90%;}
+#main table.workers td.process small a { color:#999;}
+#main.polling table.workers tr.working td { background:#f4ffe4; color:#7ac312;}
+#main.polling table.workers tr.working td.where a { color:#7ac312;}
+#main.polling table.workers tr.working td.process code { font-weight:bold;}
+
+
+#main table.stats th { font-size:100%; width:40%; color:#000;}
+#main hr { border:0; border-top:5px solid #efefef;  margin:15px 0;}
+
+#footer { padding:10px 5%; background:#efefef; color:#999; font-size:85%; line-height:1.5; border-top:5px solid #ccc; padding-top:10px;}  
+#footer p a { color:#999;}
+
+#main p.poll { background:url(poll.png) no-repeat 0 2px; padding:3px 0; padding-left:23px; float:right; font-size:85%; }
+
+#main ul.failed {}
+#main ul.failed li {background:-webkit-gradient(linear, left top, left bottom, from(#efefef), to(#fff)) #efefef; margin-top:10px; padding:10px; overflow:hidden; -webkit-border-radius:5px; border:1px solid #ccc; }
+#main ul.failed li dl dt {font-size:80%; color:#999; width:60px; float:left; padding-top:1px; text-align:right;}
+#main ul.failed li dl dd {margin-bottom:10px; margin-left:70px;}
+#main ul.failed li dl dd code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%;}
+#main ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; }
+#main ul.failed li dl dd.error pre { margin-top:3px; line-height:1.3;}
+
+#main p.pagination { background:#efefef; padding:10px; overflow:hidden;}
+#main p.pagination a.less { float:left;}
+#main p.pagination a.more { float:right;}
+
+#main form.clear-failed {float:right; margin-top:-10px;}

data/lib/resque/server/views/error.erb

@@ -1 +1 @@
-<h1><%= error %></h1>
+<h1 style="font-size:110%;font-family:Arial, sans-serif;"><%= error %></h1>

data/lib/resque/server/views/failed.erb

@@ -1,29 +1,35 @@
-<h1><%= size = Resque::Failure.count %> Jobs Failed</h1>
-<h2>Showing <%= start = params[:start].to_i %> to <%= start + 20 %></h2>
-<table>
-  <tr>
-    <th>Queue</th>
-    <th>Worker</th>
-    <th>Failed</th>
-    <th>Class</th>
-    <th>Args</th>
-    <th>Error</th>
-  </tr>
-  <% for job in Resque::Failure.all(start, 20) %>
-  <tr>
-    <td><%= job['queue'] %></td>
-    <td><a href="<= url(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a></td>
-    <td><span class="time"><%= job['failed_at'] %></span></td>
-    <td><%= job['payload']['class'] %></td>
-    <td>
-      <a href="#" class="backtrace"><%= Array(job['payload']['args']).size %></a>
-      <pre style="display:none;"><%=h show_args(job['payload']['args']) %></pre>
-    </td>
-    <td>
-      <a href="#" class="backtrace"><%= h(job['error']) %></a>
-      <pre style="display:none;"><%=h job['backtrace'].join("\n") %></pre>
-    </td>
-  </tr>
-  <% end %>
-  <%= partial :next_more, :start => start, :size => size %>
-</table>
+<%start = params[:start].to_i %>
+<%failed = Resque::Failure.all(start, 20)%>
+
+<h1>Failed Jobs</h1>
+<%unless failed.empty?%>
+<form method="POST" action="<%=u 'failed/clear'%>" class='clear-failed'>
+  <input type='submit' name='' value='Clear Failed Jobs' />
+</form>
+<%end%>
+
+<p class='sub'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque::Failure.count %></b> jobs</p>
+
+<ul class='failed'>
+  <%for job in failed%>
+    <li>
+      <dl>
+        <dt>Worker</dt>
+        <dd><a href="<%= url(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= job['failed_at'] %></span></b></dd>
+        <dt>Class</dt>
+        <dd><code><%= job['payload']['class'] %></code></dd>
+        <dt>Arguments</dt>
+        <dd><pre><%=h show_args(job['payload']['args']) %></pre></dd>
+        <dt>Error</dt>
+        <dd class='error'>
+          <a href="#" class="backtrace"><%= h(job['error']) %></a>
+          <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>          
+        </dd>
+      </dl>
+      <div class='r'>
+      </div>
+    </li>
+  <%end%>
+</ul>
+
+<%= partial :next_more, :start => start, :size => size %>

data/lib/resque/server/views/layout.erb

@@ -2,20 +2,15 @@
 <html>
 <head>
   <title>Resque.</title>
+  <link href="<%=u 'reset.css' %>" media="screen" rel="stylesheet" type="text/css">
   <link href="<%=u 'style.css' %>" media="screen" rel="stylesheet" type="text/css">
-  <link href="<%=u 'tabs.css' %>" media="screen" rel="stylesheet" type="text/css">
   <script src="<%=u 'jquery-1.3.2.min.js' %>" type="text/javascript"</script>
   <script src="<%=u 'jquery.relatize_date.js' %>" type="text/javascript"</script>  
   <script src="<%=u 'ranger.js' %>" type="text/javascript"></script>
 </head>
 <body>
-  
-<div class="navigation" id="top">
-  <div class="tabs">
-    <div id="logo">
-      Resque
-    </div>
-    <ul>
+  <div class="header">
+    <ul class='nav'>
       <%= tab "Overview" %>
       <%= tab "Working" %>
       <%= tab "Failed" %>
@@ -24,20 +19,23 @@
       <%= tab "Stats" %>
     </ul>
   </div>
+  
   <% if @subtabs %>
-    <div class="tabs">
-      <ul>
-        <% for subtab in @subtabs %>
-          <li <%= class_if_current "#{current_section}/#{subtab}" %>><a href="<%= current_section %>/<%= subtab %>"><span><%= subtab %></span></a></li>
-        <% end %>
-      </ul>
-    </div>
+    <ul class='subnav'>
+      <% for subtab in @subtabs %>
+        <li <%= class_if_current "#{current_section}/#{subtab}" %>><a href="<%= current_section %>/<%= subtab %>"><span><%= subtab %></span></a></li>
+      <% end %>
+    </ul>
   <% end %>
-</div>
-
+  
 <div id="main">
   <%= yield %>
 </div>
 
+<div id="footer">
+  <p>Powered by <a href="http://github.com/defunkt/resque">Resque</a> v<%=Resque::Version%></p>
+  <p>Connected to Redis on <%=Resque.redis.server%></p>
+</div>
+
 </body>
 </html>

data/lib/resque/server/views/next_more.erb

@@ -1,12 +1,10 @@
-    <tr>
-      <td>
-        <% if start - 20 >= 0 %>
-          <a href="/<%= current_page %>?start=<%= start - 20 %>">&laquo; less</a>
-        <% end %>
-      </td>
-      <td>
-        <% if start + 20 <= size %>
-          <a href="/<%= current_page %>?start=<%= start + 20 %>">more &raquo;</a>
-        <% end %>
-      </td>
-    </tr>
+<%if  start - 20 >= 0 || start + 20 <= size%>
+<p class='pagination'>
+  <% if start - 20 >= 0 %>
+    <a href="<%= current_page %>?start=<%= start - 20 %>" class='less'>&laquo; less</a>
+  <% end %>
+  <% if start + 20 <= size %>
+    <a href="<%= current_page %>?start=<%= start + 20 %>" class='more'>more &raquo;</a>
+  <% end %>
+</p>
+<%end%>

data/lib/resque/server/views/overview.erb

@@ -1,2 +1,4 @@
 <%= partial :queues %>
+<hr />
 <%= partial :working %>
+<%= poll %>

data/lib/resque/server/views/queues.erb

@@ -2,38 +2,44 @@
 
 <% if queue = params[:id] %>
 
-  <h1><%= size = resque.size(queue) %> Pending Jobs in '<%= queue.upcase %>'</h1>
-  <h2>Showing <%= start = params[:start].to_i %> to <%= start + 20 %></h2>
-  <table>
+  <h1>Pending jobs on <span class='hl'><%= queue %></span></h1>
+  <p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque.size(queue)%></b> jobs</p>
+  <table class='jobs'>
     <tr>
       <th>Class</th>
       <th>Args</th>
     </tr>
-    <% for job in resque.peek(queue, start, 20) %>
+    <% for job in (jobs = resque.peek(queue, start, 20)) %>
     <tr>
-      <td><%= job['class'] %></td>
-      <td><%=h job['args'].inspect %></td>
+      <td class='class'><%= job['class'] %></td>
+      <td class='args'><%=h job['args'].inspect %></td>
+    </tr>
+    <% end %>
+    <% if jobs.empty? %>
+    <tr>
+      <td class='no-data' colspan='2'>There are no pending jobs in this queue</td>
     </tr>
     <% end %>
-    <%= partial :next_more, :start => start, :size => size %>
   </table>
+  <%= partial :next_more, :start => start, :size => size %>
 <% else %>
 
-  <h1>Queues</h1>
-  <table>
+  <h1 class='wi'>Queues</h1>
+  <p class='intro'>The list below contains all the registered queues with the number of jobs currently in the queue. Select a queue from above to view all jobs currently pending on the queue.</p>
+  <table class='queues'>
     <tr>
       <th>Name</th>
-      <th>Pending</th>
+      <th>Jobs</th>
     </tr>
     <% for queue in resque.queues.sort_by { |q| q.to_s } %>
     <tr>
-      <td><a class="queue" href="<%= url "queues/#{queue}" %>"><%= queue %></a></td>
-      <td><%= resque.size queue %></td>
+      <td class='queue'><a class="queue" href="<%= url "queues/#{queue}" %>"><%= queue %></a></td>
+      <td class='size'><%= resque.size queue %></td>
     </tr>
     <% end %>
-    <tr>
-      <td><a class="queue" href="<%= url :failed %>">failed</a></td>
-      <td><%= Resque::Failure.count %></td>
+    <tr class='failed'>
+      <td class='queue failed'><a class="queue" href="<%= url :failed %>">failed</a></td>
+      <td class='size'><%= Resque::Failure.count %></td>
     </tr>
   </table>
 

data/lib/resque/server/views/stats.erb

@@ -7,12 +7,12 @@
 <% elsif params[:id] == "resque" %>
 
   <h1><%= resque %></h1>
-  <table>
+  <table class='stats'>
   <% for key, value in resque.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
-      <td>
+      <th>
         <%= key %>
-      </td>
+      </th>
       <td>
         <%= value %>
       </td>
@@ -22,13 +22,13 @@
 
 <% elsif params[:id] == 'redis' %>
 
-  <h1><%= resque.redis %></h1>
-  <table>
+  <h1><%= resque.redis.server %></h1>
+  <table class='stats'>
   <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
-      <td>
+      <th>
         <%= key %>
-      </td>
+      </th>
       <td>
         <%= value %>
       </td>
@@ -39,8 +39,8 @@
 <% elsif params[:id] == 'keys' %>
 
   <h1>Keys owned by <%= resque %></h1>
-  <h2>(All keys are actually prefixed with "resque:")</h2>
-  <table>
+  <p class='sub'>(All keys are actually prefixed with "resque:")</p>
+  <table class='stats'>
     <tr>
       <th>key</th>
       <th>type</th>
@@ -48,9 +48,9 @@
     </tr>
   <% for key in resque.keys.sort %>
     <tr>
-      <td>
+      <th>
         <a href="/stats/keys/<%= key %>"><%= key %></a>
-      </td>
+      </th>
       <td><%= resque.redis.type key %></td>
       <td><%= redis_get_size key %></td>
     </tr>

data/lib/resque/server/views/workers.erb

@@ -1,7 +1,7 @@
 <% if params[:id] && worker = Resque::Worker.find(params[:id]) %>
 
   <h1>Worker <%= worker %></h1>
-  <table>
+  <table class='workers'>
     <tr>
       <th>&nbsp;</th>
       <th>Host</th>
@@ -13,22 +13,22 @@
       <th>Processing</th>
     </tr>
     <tr>
-      <td><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+      <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
 
       <% host, pid, queues = worker.to_s.split(':') %>
       <td><%= host %></td>
       <td><%= pid %></td>
       <td><span class="time"><%= worker.started %></a></td>
-      <td><%= queues.split(',').map { |q| '<a class="queue" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join(', ') %></td>
+      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
       <td><%= worker.processed %></td>
       <td><%= worker.failed %></td>
-      <td>
+      <td class='process'>
         <% data = worker.processing || {} %>
         <% if data['queue'] %>
           <code><%= data['payload']['class'] %></code>
           <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= data['run_at'] %></a></small>
         <% else %>
-          Waiting for more
+          <span class='waiting'>Waiting for a job...</span>
         <% end %>
       </td>
     </tr>
@@ -40,33 +40,39 @@
 
 <% else %>
 
-  <h1><%= resque.workers.size %> Workers</h1>
-  <table>
+  <h1 class='wi'><%= resque.workers.size %> Workers</h1>
+  <p class='intro'>The workers listed below are all registered as active on your system.</p>
+  <table class='workers'>
     <tr>
       <th>&nbsp;</th>
       <th>Where</th>
       <th>Queues</th>
       <th>Processing</th>
     </tr>
-    <% for worker in resque.workers.sort_by { |w| w.to_s } %>
-    <tr>
-      <td><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+    <% for worker in (workers = resque.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>
 
       <% host, pid, queues = worker.to_s.split(':') %>
-      <td><a href="/workers/<%= worker %>"><%= host %>:<%= pid %></a></td>
-      <td><%= queues.split(',').map { |q| '<a class="queue" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join(', ') %></td>
+      <td class='where'><a href="<%=u "workers/#{worker}"%>"><%= host %>:<%= pid %></a></td>
+      <td class='queues'><%= queues.split(',').map { |q| '<a class="queue-tag" href="' + u("/queues/#{q}") + '">' + q + '</a>'}.join('') %></td>
 
-      <td>
+      <td class='process'>
         <% data = worker.processing || {} %>
         <% if data['queue'] %>
           <code><%= data['payload']['class'] %></code>
           <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= data['run_at'] %></a></small>
         <% else %>
-          Waiting for more
+          <span class='waiting'>Waiting for a job...</span>
         <% end %>
       </td>
     </tr>
     <% end %>
+    <% if workers.empty? %>
+    <tr>
+      <td colspan='4' class='no-data'>There are no registered workers</td>
+    </tr>
+    <% end %>
   </table>
-
+  <%=poll%>
 <% end %>

data/lib/resque/server/views/working.erb

@@ -28,8 +28,9 @@
 <% else %>
 
   <% workers = resque.working %>
-  <h1><%= workers.size %> of <%= resque.workers.size %> Workers Working</h1>
-  <table>
+  <h1 class='wi'><%= workers.size %> of <%= resque.workers.size %> Workers Working</h1>
+  <p class='intro'>The list below contains all workers which are currently running a job.</p>
+  <table class='workers'>
     <tr>
       <th>&nbsp;</th>
       <th>Where</th>
@@ -38,25 +39,25 @@
     </tr>
     <% if workers.empty? %>
     <tr>
-      <td colspan="4">Not a one.</td>
+      <td colspan="4" class='no-data'>Nothing is happening right now...</td>
     </tr>
     <% end %>
 
     <% for worker in workers.sort_by { |w| w.job['run_at'] ? w.job['run_at'] : '' } %>
       <% job = worker.job %>
       <tr>
-        <td><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
+        <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>
-        <td><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
-        <td>
-          <a class="queue" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>
+        <td class='where'><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
+        <td class='queues queue'>
+          <a class="queue-tag" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>
         </td>
-        <td>
+        <td class='process'>
           <% if job['queue'] %>
             <code><%= job['payload']['class'] %></code>
             <small><a class="queue time" href="<%=u "/working/#{worker}" %>"><%= job['run_at'] %></a></small>
           <% else %>
-            Waiting for more
+            <span class='waiting'>Waiting for a job...</span>
           <% end %>
         </td>
       </tr>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.0.0'
+  Version = '1.1.0'
 end

data/test/worker_test.rb

@@ -22,6 +22,14 @@ context "Resque::Worker" do
     assert_equal 10, Resque::Failure.all(0, 20).size
   end
 
+  test "can clear failed jobs" do
+    Resque::Job.create(:jobs, BadJob)
+    @worker.work(0)
+    assert_equal 1, Resque::Failure.count
+    Resque::Failure.clear
+    assert_equal 0, Resque::Failure.count
+  end
+
   test "catches exceptional jobs" do
     Resque::Job.create(:jobs, BadJob)
     Resque::Job.create(:jobs, BadJob)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,6 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- TODO.md
 - bin/resque
 - bin/resque-web
 - config.ru
@@ -40,7 +39,8 @@ files:
 - examples/demo/app.rb
 - examples/demo/config.ru
 - examples/demo/job.rb
-- examples/existing_classes_as_jobs.rb
+- examples/god/resque.god
+- examples/god/stale.god
 - examples/instance.rb
 - examples/simple.rb
 - init.rb
@@ -56,13 +56,10 @@ files:
 - lib/resque/server/public/idle.png
 - lib/resque/server/public/jquery-1.3.2.min.js
 - lib/resque/server/public/jquery.relatize_date.js
-- lib/resque/server/public/nav-bg.png
+- lib/resque/server/public/poll.png
 - lib/resque/server/public/ranger.js
 - lib/resque/server/public/reset.css
 - lib/resque/server/public/style.css
-- lib/resque/server/public/tab_b.gif
-- lib/resque/server/public/tab_r.gif
-- lib/resque/server/public/tabs.css
 - lib/resque/server/public/working.png
 - lib/resque/server/views/error.erb
 - lib/resque/server/views/failed.erb
@@ -119,6 +116,5 @@ test_files:
 - examples/async_helper.rb
 - examples/demo/app.rb
 - examples/demo/job.rb
-- examples/existing_classes_as_jobs.rb
 - examples/instance.rb
 - examples/simple.rb

data/TODO.md

@@ -1,60 +0,0 @@
-Little Stuff
------------
-
-[ ] Show stale workers in red with a warning icon in the Sinatra app
-
-
-Big Stuff
----------
-
-### async
-
-I want the `async` helper to be first class. Something like this:
-
-    class Repository < ActiveRecord::Base
-        include Resque::AsyncHelper
-    end
-
-This adds an `async` instance method and a `perform` class method.
-
-The `async` method looks like this:
-
-    def async(method, *args)
-      Resque.enqueue(self.class, id, method, *args)
-    end
-
-The `perform` method looks like this:
-
-    def self.perform(id, method, *args)
-      find(id).send(method, *args)
-    end
-
-Of course, you can define your own `self.perform` and have it still 
-work beautifully. We might override ours in GitHub to look like this:
-
-    def self.perform(id, method, *args)
-      return unless repo = cached_by_id(id)
-      repo.send(method, *args)
-    end
-
-Then: `@repo.async(:update_disk_usage)` issues a job equivalent to:
-
-    Resque.enqueue(Repository, 44, :update_disk_usage)
-
-Booyah.
-
-
-### gem install
-
-`gem install resque` should pull in yajl, redis, sinatra, rake, and rack
-
-Do it like Unicorn does it.
-
-### Parent / Child => Master / Workers
-
-On an ideal setup (REE + Linux) you'll have 2N Resque processes
-running at any time: N parents and N children.
-
-We can cut this number down to N+1 by moving from a parent / child
-architecture to a master / workers architecture.
-

data/examples/existing_classes_as_jobs.rb

@@ -1,3 +0,0 @@
-# Let's say this is a class in your app, already
-
-# TODO: example

data/lib/resque/server/public/tabs.css

@@ -1,189 +0,0 @@
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-DIV.tabs
-{
-   float            : left;
-   width            : 100%;
-   background       : url("tab_b.gif") repeat-x bottom;
-   margin-bottom    : 4px;
-}
-
-DIV.tabs UL
-{
-   margin           : 0px;
-   padding-left     : 10px;
-   list-style       : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
-   display          : inline;
-   margin           : 0px;
-   padding          : 0px;
-}
-
-DIV.tabs FORM
-{
-   float            : right;
-}
-
-DIV.tabs A
-{
-   float            : left;
-   background       : url("tab_r.gif") no-repeat right top;
-   border-bottom    : 1px solid #84B0C7;
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-DIV.tabs A:hover
-{
-   background-position: 100% -150px;
-}
-
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
-       color: #1A419D;
-}
-
-DIV.tabs SPAN
-{
-   float            : left;
-   display          : block;
-   background       : url("tab_l.gif") no-repeat left top;
-   padding          : 5px 9px;
-   white-space      : nowrap;
-}
-
-DIV.tabs INPUT
-{
-   float            : right;
-   display          : inline;
-   font-size        : 1em;
-}
-
-DIV.tabs TD
-{
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
-   background-position: 0% -150px;
-}
-
-DIV.tabs LI.current A
-{
-   background-position: 100% -150px;
-   border-width     : 0px;
-}
-
-DIV.tabs LI.current SPAN
-{
-   background-position: 0% -150px;
-   padding-bottom   : 6px;
-}
-
-DIV.navpath
-{
-   background       : none;
-   border           : none;
-   border-bottom    : 1px solid #84B0C7;
-   text-align       : center;
-   margin           : 2px;
-   padding          : 2px;
-}
-div.tabs {
-  background: url(nav-bg.png) repeat-x !important;
-  margin: 0 !important;
-  margin-bottom: 0 !important;
-  padding: 8px 0;
-  float: none;
-  border-bottom: 1px solid #A4B0BC;
-  font-size: 100%;
-}
-
-div.tabs li {
-  line-height: 100%;
-  display: block;
-  float: left;
-  margin-right: 10px;
-}
-
-div.tabs a {
-  background: none;
-  font-size: 100%;
-  padding: 5px 8px;
-  text-shadow: 1px 1px #eff4f7;
-}
-
-div.tabs span {
-  background: none;
-  padding: 0;
-}
-
-div.tabs li.current a {
-  background: #bdcad4;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-  text-shadow: none;
-}
-
-div.tabs li.current span {
-  padding: 0;
-}
-
-div.tabs a:link, div.tabs a:visited, div.tabs a:active, div.tabs a:hover
-{
-  color: #546e80;
-  border: none;
-}
-
-div.tabs ul:after {
-  content: ".";
-  display: block;
-  clear: both;
-  height: 0;
-  visibility: hidden;
-}
-
-div.tabs + div.tabs {
-  background: #f2f6f9  !important;
-  border-bottom: 1px solid #e2ecf3 !important;
-}
-
-div.navpath {
-  line-height: 100%;
-  text-align: left;
-  background: #f2f6f9  !important;
-  border-bottom: 1px solid #e2ecf3 !important;
-  padding: 0;
-  margin: 0;
-}
-
-div.navpath:after {
-  content: ".";
-  display: block;
-  visibility: hidden;
-  clear: both;
-  padding: 0;
-  margin: 0;
-  height: 0;
-}
-
-div.navpath a {
-  display: block;
-  float: left;
-  padding: 8px 20px;
-  color: #8c99a3;
-}