resque 1.23.0 → 1.23.1

data/lib/resque/failure/thoughtbot.rb

@@ -13,7 +13,7 @@ module Resque
           klass.configure(&block)
         end
 
-        def count
+        def count(queue = nil, class_name = nil)
           # We can't get the total # of errors from Hoptoad so we fake it
           # by asking Resque how many errors it has seen.
           Stat[:failed]

data/lib/resque/log_formatters/quiet_formatter.rb

@@ -0,0 +1,7 @@
+module Resque
+  class QuietFormatter
+    def call(serverity, datetime, progname, msg)
+      ""
+    end
+  end
+end

data/lib/resque/log_formatters/verbose_formatter.rb

@@ -0,0 +1,7 @@
+module Resque
+  class VerboseFormatter
+    def call(serverity, datetime, progname, msg)
+      "*** #{msg}\n"
+    end
+  end
+end

data/lib/resque/log_formatters/very_verbose_formatter.rb

@@ -0,0 +1,8 @@
+module Resque
+  class VeryVerboseFormatter
+    def call(serverity, datetime, progname, msg)
+      time = Time.now.strftime('%H:%M:%S %Y-%m-%d')
+      "** [#{time}] #$$: #{msg}\n"
+    end
+  end
+end

data/lib/resque/logging.rb

@@ -0,0 +1,18 @@
+module Resque
+  # Include this module in classes you wish to have logging facilities
+  module Logging
+    module_function
+
+    # Thunk to the logger's own log method (if configured)
+    def self.log(severity, message)
+      Resque.logger.__send__(severity, message) if Resque.logger
+    end
+    
+    # Log level aliases
+    def debug(message); Logging.log :debug, message; end
+    def info(message);  Logging.log :info,  message; end
+    def warn(message);  Logging.log :warn,  message; end
+    def error(message); Logging.log :error, message; end
+    def fatal(message); Logging.log :fatal, message; end
+  end
+end

data/lib/resque/server.rb

@@ -10,6 +10,8 @@ end
 
 module Resque
   class Server < Sinatra::Base
+    require 'resque/server/helpers'
+
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/server/views"
@@ -181,11 +183,24 @@ module Resque
       end
     end
 
+    get "/failed/:queue" do
+      if Resque::Failure.url
+        redirect Resque::Failure.url
+      else
+        show :failed
+      end
+    end
+
     post "/failed/clear" do
       Resque::Failure.clear
       redirect u('failed')
     end
 
+    post "/failed/:queue/clear" do
+      Resque::Failure.clear params[:queue]
+      redirect u('failed')
+    end
+
     post "/failed/requeue/all" do
       Resque::Failure.count.times do |num|
         Resque::Failure.requeue(num)
@@ -193,6 +208,11 @@ module Resque
       redirect u('failed')
     end
 
+    post "/failed/:queue/requeue/all" do
+      Resque::Failure.requeue_queue Resque::Failure.job_queue_name(params[:queue])
+      redirect url_path("/failed/#{params[:queue]}")
+    end
+
     get "/failed/requeue/:index/?" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

data/lib/resque/server/helpers.rb

@@ -0,0 +1,48 @@
+Resque::Server.helpers do
+  ####################
+  #failed.erb helpers#
+  ####################
+
+  def failed_date_format
+    "%Y/%m/%d %T %z"
+  end
+
+  def failed_multiple_queues?
+    return @multiple_failed_queues if defined?(@multiple_failed_queues)
+    @multiple_failed_queues = Resque::Failure.queues.size > 1
+  end
+
+  def failed_size
+    @failed_size ||= Resque::Failure.count(params[:queue], params[:class])
+  end
+
+  def failed_per_page
+    @failed_per_page = if params[:class]
+      failed_size  
+    else
+      20
+    end
+  end
+
+  def failed_start_at
+    params[:start].to_i
+  end
+
+  def failed_end_at
+    if failed_start_at + failed_per_page > failed_size
+      failed_size
+    else
+      failed_start_at + failed_per_page
+    end
+  end
+
+  def failed_class_counts(queue = params[:queue])
+    classes = Hash.new(0)
+    Resque::Failure.each(0, Resque::Failure.count(queue), queue) do |_, item|
+      class_name = item['payload']['class'] if item['payload']
+      class_name ||= "nil"
+      classes[class_name] += 1
+    end
+    classes
+  end
+end

data/lib/resque/server/public/jquery.relatize_date.js

@@ -67,21 +67,21 @@
      * @param {Boolean} Include the time in the output
      */
     distanceOfTimeInWords: function(fromTime, toTime, includeTime) {
-      var delta = parseInt((toTime.getTime() - fromTime.getTime()) / 1000);
+      var delta = parseInt((toTime.getTime() - fromTime.getTime()) / 1000, 10);
       if (delta < 60) {
           return 'just now';
       } else if (delta < 120) {
           return 'about a minute ago';
       } else if (delta < (45*60)) {
-          return (parseInt(delta / 60)).toString() + ' minutes ago';
+          return (parseInt(delta / 60, 10)).toString() + ' minutes ago';
       } else if (delta < (120*60)) {
           return 'about an hour ago';
       } else if (delta < (24*60*60)) {
-          return 'about ' + (parseInt(delta / 3600)).toString() + ' hours ago';
+          return 'about ' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
       } else if (delta < (48*60*60)) {
           return '1 day ago';
       } else {
-        var days = (parseInt(delta / 86400)).toString();
+        var days = (parseInt(delta / 86400, 10)).toString();
         if (days > 5) {
           var fmt  = '%B %d, %Y'
           if (includeTime) fmt += ' %I:%M %p'

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

@@ -41,10 +41,15 @@ $(function() {
     $("#main").addClass('polling')
 
     setInterval(function() {
-      $.ajax({dataType: 'text', type: 'get', url: href, success: function(data) {
-        $('#main').html(data)
-        $('#main .time').relatizeDate()
-      }})
+      $.ajax({dataType: 'text', type: 'get', url: href,
+        success: function(data) {
+          $('#main').html(data)
+          $('#main .time').relatizeDate()
+        },
+        error: function(data) {
+          if (data.status == '401') { window.location.href = '/' }
+        }
+      })
     }, poll_interval * 1000)
 
     return false

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

@@ -23,7 +23,7 @@ body { padding:0; margin:0; }
 #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 th { background:#efefef; color:#888; font-size:15px; 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;}
@@ -33,9 +33,9 @@ body { padding:0; margin:0; }
 
 #main table.queues { width:40%;}
 #main table.queues td.queue { font-weight:bold; width:50%;}
-#main table.queues tr.failed td { border-top:2px solid; font-size:90%; }
-#main table.queues tr.failure td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
+#main table.queues tr.failure td { background:#ffecec; font-size:90%; color:#d37474;}
 #main table.queues tr.failure td a{ color:#d37474;}
+#main table.queues tr.first_failure td { border-top:2px solid #d37474; }
 
 #main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
 #main table.jobs td.args{ width:50%;}
@@ -45,6 +45,7 @@ body { padding:0; margin:0; }
 #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 .queue-tag a { color: #3274A2; text-decoration: none; }
 #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%;}
@@ -83,4 +84,8 @@ body { padding:0; margin:0; }
 
 #main form {float:right; margin-top:-10px;margin-left:10px;}
 
-#main .time a.toggle_format {text-decoration:none;}
+#main .time a.toggle_format {text-decoration:none;}
+
+#failed tr.total td {background-color: #FFECEC; color: #D37474; font-size: 15px; font-weight: bold;}
+#failed .center {text-align: center;}
+#failed .failed_class { padding-left: 20px; font-size:12px; }

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

@@ -1,67 +1,28 @@
-<%start = params[:start].to_i %>
-<%failed = Resque::Failure.all(start, 20)%>
-<% index = 0 %>
-<% date_format = "%Y/%m/%d %T %z" %>
+<% if failed_multiple_queues? && !params[:queue] %>
+<h1>All Failed Queues: <%= Resque::Failure.queues.size %> total</h1>
+<% else %>
+<h1>Failed Jobs <%= "on '#{params[:queue]}'" if params[:queue] %> <%= "with class '#{params[:class]}'" if params[:class] %></h1>
+<% end %>
 
-<h1>Failed Jobs</h1>
-<%unless failed.empty?%>
-<form method="POST" action="<%=u 'failed/clear'%>">
-  <input type='submit' name='' value='Clear Failed Jobs' />
+<% unless failed_size.zero? %>
+<form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/clear" %>">
+  <input type="submit" name="" value="Clear <%= params[:queue] ? "'#{params[:queue]}'" : 'Failed' %> Jobs" />
 </form>
-<form method="POST" action="<%=u 'failed/requeue/all'%>">
-  <input type='submit' name='' value='Retry Failed Jobs' />
+<form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/requeue/all" %>">
+  <input type="submit" name="" value="Retry <%= params[:queue] ? "'#{params[:queue]}'" : 'Failed' %> Jobs" />
 </form>
-<%end%>
+<% end %>
 
-<p class='sub'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque::Failure.count %></b> jobs</p>
+<% if failed_multiple_queues? && !params[:queue] %>
+<%= partial :failed_queues_overview %>
+<% else %>
+<p class='sub'>Showing <%= failed_start_at %> to <%= failed_end_at %> of <b><%= failed_size %></b> jobs</p>
 
 <ul class='failed'>
-  <%for job in failed%>
-    <% index += 1 %>
-    <li>
-      <dl>
-        <% if job.nil? %>
-        <dt>Error</dt>
-        <dd>Job <%= index%> could not be parsed; perhaps it contains invalid JSON?</dd>
-        <% else %>
-        <dt>Worker</dt>
-        <dd>
-          <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime(date_format) %></span></b>
-          <% if job['retried_at'] %>
-            <div class='retried'>
-              Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime(date_format) %></span></b>
-              <a href="<%= u "failed/remove/#{start + index - 1}" %>" class="remove" rel="remove">Remove</a>
-            </div>
-          <% else %>
-            <div class='controls'>
-              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
-              or
-              <a href="<%= u "failed/remove/#{start + index - 1}" %>" rel="remove">Remove</a>
-            </div>
-          <% end %>
-        </dd>
-        <dt>Class</dt>
-        <dd><code><%= job['payload'] ? job['payload']['class'] : 'nil' %></code></dd>
-        <dt>Arguments</dt>
-        <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
-        <dt>Exception</dt>
-        <dd><code><%= job['exception'] %></code></dd>
-        <dt>Error</dt>
-        <dd class='error'>
-          <% if job['backtrace'] %>
-            <a href="#" class="backtrace"><%= h(job['error']) %></a>
-            <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
-          <% else %>
-            <%=h job['error'] %>
-          <% end %>
-        </dd>
-        <% end %>
-      </dl>
-      <div class='r'>
-      </div>
-    </li>
-  <%end%>
+  <% Resque::Failure.each(failed_start_at, failed_per_page, params[:queue], params[:class]) do |id, job| %>
+    <%= partial :failed_job, :id => id, :job => job %>
+  <% end %>
 </ul>
 
-<%= partial :next_more, :start => start, :size => size %>
-
+<%= partial :next_more, :start => failed_start_at, :size => failed_size unless params[:class] %>
+<% end %>

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

@@ -0,0 +1,50 @@
+<li>
+  <dl>
+    <% if job.nil? %>
+    <dt>Error</dt>
+    <dd>Job <%= id %> could not be parsed; perhaps it contains invalid JSON?</dd>
+    <% else %>
+    <dt>Worker</dt>
+    <dd>
+      <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime(failed_date_format) %></span></b>
+      <% if job['retried_at'] %>
+        <div class='retried'>
+          Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime(failed_date_format) %></span></b>
+          <a href="<%= u "failed/remove/#{id}" %>" class="remove" rel="remove">Remove</a>
+        </div>
+      <% else %>
+        <div class='controls'>
+          <a href="<%= u "failed/requeue/#{id}" %>" rel="retry">Retry</a>
+          or
+          <a href="<%= u "failed/remove/#{id}" %>" rel="remove">Remove</a>
+        </div>
+      <% end %>
+    </dd>
+    <dt>Class</dt>
+    <dd>
+      <% if job['payload'] && job['payload']['class'] %>
+        <a href="<%= u "failed/#{params[:queue]}?class=#{job['payload']['class']}" %>">
+          <code><%= job['payload']['class'] %></code>
+        </a>
+      <% else %>
+        <code>nil</code>
+      <% end %>
+    </dd>
+    <dt>Arguments</dt>
+    <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
+    <dt>Exception</dt>
+    <dd><code><%= job['exception'] %></code></dd>
+    <dt>Error</dt>
+    <dd class='error'>
+      <% if job['backtrace'] %>
+        <a href="#" class="backtrace"><%= h(job['error']) %></a>
+        <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
+      <% else %>
+        <%=h job['error'] %>
+      <% end %>
+    </dd>
+    <% end %>
+  </dl>
+  <div class='r'>
+  </div>
+</li>

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

@@ -0,0 +1,24 @@
+<table id="failed">
+<tbody>
+  <tr class="total">
+    <td class='queue'>Total Failed</td>
+    <td class='center'><%= Resque::Failure.count %></td>
+  </tr>
+
+  <% Resque::Failure.queues.sort.each do |queue| %>
+	  <tr>
+	    <th><b class="queue-tag"><a href="/failed/<%= queue %>"><%= queue %></a></b></th>
+	    <th style="width:75px;" class="center"><%= Resque::Failure.count(queue) %></th>
+	  </tr>
+
+    <% failed_class_counts(queue).sort_by { |name,_| name }.each do |k, v| %>
+    <tr id="<%= k %>">
+      <td>
+        <a href="/failed/<%= "#{queue}?class=#{k}" %>"><span class="failed failed_class"><%= k %></span></a>
+      </td>
+      <td style="text-align: center;" class="failed<%= (v.to_i > 1000) ? '_many' : '' %>"><%= v %></td>
+    </tr>
+	  <% end %>
+  <% end %>
+</tbody>
+</table>

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

@@ -34,16 +34,25 @@
       <th>Name</th>
       <th>Jobs</th>
     </tr>
-    <% for queue in resque.queues.sort_by { |q| q.to_s } %>
+    <% resque.queues.sort_by { |q| q.to_s }.each do |queue| %>
     <tr>
       <td class='queue'><a class="queue" href="<%= u "queues/#{queue}" %>"><%= queue %></a></td>
       <td class='size'><%= resque.size queue %></td>
     </tr>
     <% end %>
-    <tr class="<%= Resque::Failure.count.zero? ? "failed" : "failure" %>">
-      <td class='queue failed'><a class="queue" href="<%= u :failed %>">failed</a></td>
-      <td class='size'><%= Resque::Failure.count %></td>
-    </tr>
+    <% if failed_multiple_queues? %>
+      <% Resque::Failure.queues.sort_by { |q| q.to_s }.each_with_index do |queue, i| %>
+      <tr class="<%= Resque::Failure.count(queue).zero? ? "failed" : "failure" %><%= " first_failure" if i.zero? %>">
+        <td class='queue failed'><a class="queue" href="<%= u "failed/#{queue}" %>"><%= queue %></a></td>
+        <td class='size'><%= Resque::Failure.count(queue) %></td>
+      </tr>
+      <% end %>
+    <% else %>
+      <tr class="<%= Resque::Failure.count.zero? ? "failed" : "failure" %>">
+        <td class='queue failed'><a class="queue" href="<%= u :failed %>">failed</a></td>
+        <td class='size'><%= Resque::Failure.count %></td>
+      </tr>
+    <% end %>
   </table>
 
 <% end %>

data/lib/resque/tasks.rb

@@ -12,8 +12,12 @@ namespace :resque do
 
     begin
       worker = Resque::Worker.new(*queues)
-      worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
-      worker.very_verbose = ENV['VVERBOSE']
+      if ENV['LOGGING'] || ENV['VERBOSE']
+        worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
+      end
+      if ENV['VVERBOSE']
+        worker.very_verbose = ENV['VVERBOSE']
+      end
       worker.term_timeout = ENV['RESQUE_TERM_TIMEOUT'] || 4.0
       worker.term_child = ENV['TERM_CHILD']
     rescue Resque::NoQueueError
@@ -60,4 +64,19 @@ namespace :resque do
       Rails::Initializer.run :load_application_classes
     end
   end
+
+  namespace :failures do
+    desc "Sort the 'failed' queue for the redis_multi_queue failure backend"
+    task :sort do
+      require 'resque'
+      require 'resque/failure/redis'
+
+      warn "Sorting #{Resque::Failure.count} failures..."
+      Resque::Failure.each(0, Resque::Failure.count) do |_, failure|
+        data = Resque.encode(failure)
+        Resque.redis.rpush(Resque::Failure.failure_queue_name(failure['queue']), data)
+      end
+      warn "done!"
+    end
+  end
 end