resque-mongo 1.4.0 → 1.8.1

data/lib/resque/plugin.rb

@@ -0,0 +1,46 @@
+module Resque
+  module Plugin
+    extend self
+
+    LintError = Class.new(RuntimeError)
+
+    # Ensure that your plugin conforms to good hook naming conventions.
+    #
+    #   Resque::Plugin.lint(MyResquePlugin)
+    def lint(plugin)
+      hooks = before_hooks(plugin) + around_hooks(plugin) + after_hooks(plugin)
+
+      hooks.each do |hook|
+        if hook =~ /perform$/
+          raise LintError, "#{plugin}.#{hook} is not namespaced"
+        end
+      end
+
+      failure_hooks(plugin).each do |hook|
+        if hook =~ /failure$/
+          raise LintError, "#{plugin}.#{hook} is not namespaced"
+        end
+      end
+    end
+
+    # Given an object, returns a list `before_perform` hook names.
+    def before_hooks(job)
+      job.methods.grep(/^before_perform/).sort
+    end
+
+    # Given an object, returns a list `around_perform` hook names.
+    def around_hooks(job)
+      job.methods.grep(/^around_perform/).sort
+    end
+
+    # Given an object, returns a list `after_perform` hook names.
+    def after_hooks(job)
+      job.methods.grep(/^after_perform/).sort
+    end
+
+    # Given an object, returns a list `on_failure` hook names.
+    def failure_hooks(job)
+      job.methods.grep(/^on_failure/).sort
+    end
+  end
+end

data/lib/resque/server.rb

@@ -20,7 +20,7 @@ module Resque
       end
 
       def current_page
-        url request.path_info.sub('/','').downcase
+        url request.path_info.sub('/','')
       end
 
       def url(*path_parts)
@@ -32,13 +32,14 @@ module Resque
         request.env['SCRIPT_NAME']
       end
 
-      def class_if_current(page = '')
-        'class="current"' if current_page.include? page.to_s
+      def class_if_current(path = '')
+        'class="current"' if current_page[0, path.size] == path
       end
 
       def tab(name)
         dname = name.to_s.downcase
-        "<li #{class_if_current(dname)}><a href='#{url dname}'>#{name}</a></li>"
+        path = url(dname)
+        "<li #{class_if_current(path)}><a href='#{path}'>#{name}</a></li>"
       end
 
       def tabs
@@ -55,19 +56,23 @@ module Resque
           Resque.redis.scard(key)
         when 'string'
           Resque.redis.get(key).length
+        when 'zset'
+          Resque.redis.zcard(key)
         end
       end
 
-      def redis_get_value_as_array(key)
+      def redis_get_value_as_array(key, start=0)
         case Resque.redis.type(key)
         when 'none'
           []
         when 'list'
-          Resque.redis.lrange(key, 0, 20)
+          Resque.redis.lrange(key, start, start + 20)
         when 'set'
-          Resque.redis.smembers(key)
+          Resque.redis.smembers(key)[start..(start + 20)]
         when 'string'
           [Resque.redis.get(key)]
+        when 'zset'
+          Resque.redis.zrange(key, start, start + 20)
         end
       end
 
@@ -85,7 +90,7 @@ module Resque
       ensure
         @partial = false
       end
-      
+
       def poll
         if @polling
           text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
@@ -94,14 +99,14 @@ module Resque
         end
         "<p class='poll'>#{text}</p>"
       end
-      
+
     end
 
     def show(page, layout = true)
       begin
         erb page.to_sym, {:layout => layout}, :resque => Resque
       rescue Errno::ECONNREFUSED
-        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis.server})"
+        erb :error, {:layout => false}, :error => "Can't connect to Mongo! (#{Resque.mongo.server})"
       end
     end
 
@@ -120,6 +125,11 @@ module Resque
       end
     end
     
+    post "/queues/:id/remove" do
+      Resque.remove_queue(params[:id])
+      redirect u('queues')
+    end
+
     %w( overview workers ).each do |page|
       get "/#{page}.poll" do
         content_type "text/plain"
@@ -135,11 +145,20 @@ module Resque
         show :failed
       end
     end
-    
+
     post "/failed/clear" do
       Resque::Failure.clear
       redirect u('failed')
     end
+    
+    get "/failed/requeue/:index" do
+      Resque::Failure.requeue(params[:index])
+      if request.xhr?
+        return Resque::Failure.all(params[:index])['retried_at']
+      else
+        redirect u('failed')
+      end
+    end
 
     get "/stats" do
       redirect url("/stats/resque")

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

@@ -1,24 +1,67 @@
-var poll_interval = 2;
-
 $(function() {
+  var poll_interval = 2
+
+  var relatizer = function(){
+    var dt = $(this).text(), relatized = $.relatizeDate(this)
+    if ($(this).parents("a").length > 0 || $(this).is("a")) {
+      $(this).relatizeDate()
+      if (!$(this).attr('title')) {
+        $(this).attr('title', dt)
+      }
+    } else {
+      $(this)
+        .text('')
+        .append( $('<a href="#" class="toggle_format" title="' + dt + '" />')
+        .append('<span class="date_time">' + dt +
+                '</span><span class="relatized_time">' +
+                relatized + '</span>') )
+    }
+  };
+
+  $('.time').each(relatizer);
+
+  $('.time a.toggle_format .date_time').hide()
+
+  var format_toggler = function(){
+    $('.time a.toggle_format span').toggle()
+    $(this).attr('title', $('span:hidden',this).text())
+    return false
+  };
+
+  $('.time a.toggle_format').click(format_toggler);
 
-  $('.time').relatizeDate()
   $('.backtrace').click(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) 
+      $.ajax({dataType: 'text', type: 'get', url: href, success: function(data) {
+        $('#main').html(data)
         $('#main .time').relatizeDate()
       }})
     }, poll_interval * 1000)
+
     return false
   })
-    
+
+  $('ul.failed a[rel=retry]').click(function() {
+    var href = $(this).attr('href');
+    $(this).text('Retrying...');
+    var parent = $(this).parent();
+    $.ajax({dataType: 'text', type: 'get', url: href, success: function(data) {
+      parent.html('Retried <b><span class="time">' + data + '</span></b>');
+      relatizer.apply($('.time', parent));
+      $('.date_time', parent).hide();
+      $('a.toggle_format span', parent).click(format_toggler);
+    }});
+    return false;
+  })
+
+
 })

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

@@ -8,6 +8,8 @@ body { padding:0; margin:0; }
 .header ul li a:hover { background:#333;}
 .header ul li.current a { background:#429234; font-weight:bold; color:#fff;}
 
+.header .namespace { position: absolute; right: 75px; top: 10px; color: #7A7A7A; }
+
 .subnav { padding:2px 5% 7px 5%; background:#429234; font-size:90%;}
 .subnav li { display:inline;}
 .subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#55ad46; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
@@ -31,6 +33,8 @@ 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.failed td { background:#ebffed; border-top:2px solid #6fd380; font-size:90%; color:#6fd380;}
 #main table.queues tr.failed td a{  color:#6fd380;}
 
@@ -64,6 +68,7 @@ body { padding:0; margin:0; }
 #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 .retry { float: right; }
 #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;}
@@ -72,4 +77,6 @@ body { padding:0; margin:0; }
 #main p.pagination a.less { float:left;}
 #main p.pagination a.more { float:right;}
 
-#main form.clear-failed {float:right; margin-top:-10px;}
+#main form {float:right; margin-top:-10px;}
+
+#main .time a.toggle_format {text-decoration:none;}

data/lib/resque/server/test_helper.rb

@@ -0,0 +1,19 @@
+require 'rack/test'
+require 'resque/server'
+
+module Resque
+  module TestHelper
+    class Test::Unit::TestCase
+      include Rack::Test::Methods
+      def app 
+        Resque::Server.new
+      end 
+
+      def self.should_respond_with_success
+        test "should respond with success" do
+          assert last_response.ok?
+        end 
+      end 
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 <%start = params[:start].to_i %>
-<%failed = Resque::Failure.all(start, 20)%>
+<%failed = [Resque::Failure.all(start, 20)].flatten %>
+<% index = 0 %>
 
 <h1>Failed Jobs</h1>
 <%unless failed.empty?%>
@@ -12,18 +13,30 @@
 
 <ul class='failed'>
   <%for job in failed%>
+    <% index += 1 %>
     <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>
+        <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>
+          <div class='retry'>
+            <% if job['retried_at'] %>
+              Retried <b><span class="time"><%= job['retried_at'] %></span></b>
+            <% else %>
+              <a href="<%= u "failed/requeue/#{start + index - 1}" %>" rel="retry">Retry</a>
+            <% end %>
+          </div>
+        </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>Exception</td>
+        <dd><code><%= job['exception'] %></code></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>          
+          <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
         </dd>
       </dl>
       <div class='r'>
@@ -33,3 +46,4 @@
 </ul>
 
 <%= partial :next_more, :start => start, :size => size %>
+

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

@@ -0,0 +1,20 @@
+<% if key = params[:key] %>
+
+  <p class='sub'>
+    Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = redis_get_size(key) %></b>
+  </p>
+
+    
+  <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
+  <table>
+    <% for row in redis_get_value_as_array(key, start) %>
+    <tr>
+      <td>
+        <%= row %>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+
+<%= partial :next_more, :start => start, :size => size %>
+<% end %>

data/lib/resque/server/views/{key.erb → key_string.erb}

@@ -1,17 +1,11 @@
 <% if key = params[:key] %>
-
   <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
   <h2>size: <%= redis_get_size(key) %></h2>
   <table>
-    <% for row in redis_get_value_as_array(key) %>
     <tr>
       <td>
-        <%= row %>
+        <%= redis_get_value_as_array(key) %>
       </td>
     </tr>
-    <% end %>
   </table>
-
-<% else %>
-
-<% end %>
+<% end %>

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

@@ -3,6 +3,9 @@
 <% if queue = params[:id] %>
 
   <h1>Pending jobs on <span class='hl'><%= queue %></span></h1>
+  <form method="POST" action="<%=u "/queues/#{queue}/remove" %>" class='remove-queue'>
+    <input type='submit' name='' value='Remove Queue' />
+  </form>
   <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>
@@ -37,10 +40,10 @@
       <td class='size'><%= resque.size queue %></td>
     </tr>
     <% end %>
-    <tr class='failed'>
+    <tr class="<%= Resque::Failure.count.zero? ? "failed" : "failure" %>">
       <td class='queue failed'><a class="queue" href="<%= url :failed %>">failed</a></td>
       <td class='size'><%= Resque::Failure.count %></td>
     </tr>
   </table>
 
-<% end %>
+<% end %>

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

@@ -2,7 +2,7 @@
 
 <% if params[:key] %>
 
-<%= partial :key %>
+<%= partial resque.redis.type(params[:key]).eql?("string") ? :key_string : :key_sets %>
 
 <% elsif params[:id] == "resque" %>
 
@@ -59,4 +59,4 @@
 
 <% else %>
 
-<% end %>
+<% end %>

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

@@ -18,7 +18,7 @@
       <% host, pid, queues = worker.to_s.split(':') %>
       <td><%= host %></td>
       <td><%= pid %></td>
-      <td><span class="time"><%= worker.started %></a></td>
+      <td><span class="time"><%= worker.started %></span></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>

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

@@ -45,6 +45,8 @@
 
     <% for worker in workers.sort_by { |w| w.job['run_at'] ? w.job['run_at'] : '' } %>
       <% job = worker.job %>
+      <% next if worker.idle? %>
+
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>

data/lib/resque/tasks.rb

@@ -24,7 +24,7 @@ namespace :resque do
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
 
-  desc "Start multiple Resque workers"
+  desc "Start multiple Resque workers. Should only be used in dev mode."
   task :workers do
     threads = []
 

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.4.0'
+  Version = '1.8.1'
 end