resque 2.0.0 → 2.6.0

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

@@ -2,21 +2,21 @@
 <% # without a default value %>
 <% per_page ||= 20 %>
 <%if  start - per_page >= 0 || start + per_page <= size%>
-<p class='pagination'>
-  <% if start + per_page <= size %>
-    <a href="<%= current_page %>?start=<%= start + per_page %>" class='more'>&laquo; Next</a>
-  <% end %>
+  <div class='pagination'>
+    <% if start - per_page >= 0 %>
+      <a href="<%= current_page %>?start=<%= start - per_page %>" class='less'>&laquo; Previous</a>
+    <% end %>
 
-  <% (size / per_page.to_f - 1).ceil.downto(0).each do |page_num| %>
-    <% if start == page_num * per_page %>
-       <%= page_num %>
-    <% else %>
-      <a href="<%= current_page %>?start=<%= page_num * per_page %>"> <%= page_num %></a>
+    <% (size / per_page.to_f).ceil.times do |page_num| %>
+      <% if start == page_num * per_page %>
+        <span><%= page_num + 1 %></span>
+      <% else %>
+        <a href="<%= current_page %>?start=<%= page_num * per_page %>"> <%= page_num + 1 %></a>
+      <% end %>
     <% end %>
-  <% end %>
 
-  <% if start - per_page >= 0 %>
-    <a href="<%= current_page %>?start=<%= start - per_page %>" class='less'>Previous &raquo;</a>
-  <% end %>
-</p>
+    <% if start + per_page < size %>
+      <a href="<%= current_page %>?start=<%= start + per_page %>" class='more'>Next &raquo;</a>
+    <% end %>
+  </div>
 <%end%>

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

@@ -2,9 +2,9 @@
 
 <% if current_queue = params[:id] %>
 
-  <h1>Pending jobs on <span class='hl'><%= current_queue %></span></h1>
-  <form method="POST" action="<%=u "/queues/#{current_queue}/remove" %>" class='remove-queue'>
-    <input type='submit' name='' value='Remove Queue' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
+  <h1>Pending jobs on <span class='hl'><%= h escape_html(current_queue) %></span></h1>
+  <form method="POST" action="<%=u "/queues/#{escape_html(current_queue)}/remove" %>" class='remove-queue'>
+    <input type='submit' name='' value='Remove Queue' class="confirmSubmission" />
   </form>
   <p class='sub'><%= page_entries_info start = params[:start].to_i, start + 19, size = resque.size(current_queue), 'job' %></p>
   <table class='jobs'>

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

@@ -6,7 +6,7 @@
 
 <% elsif params[:id] == "resque" %>
 
-  <h1><%= resque %></h1>
+  <h1><%= h resque %></h1>
   <table class='stats'>
   <% for key, value in resque.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
@@ -14,7 +14,7 @@
         <%= key %>
       </th>
       <td>
-        <%= value %>
+        <%= h value %>
       </td>
     </tr>
   <% end %>
@@ -22,7 +22,7 @@
 
 <% elsif params[:id] == 'redis' %>
 
-  <h1><%= resque.redis_id %></h1>
+  <h1><%= h resque.redis_id %></h1>
   <table class='stats'>
   <% for key, value in resque.redis.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
@@ -38,7 +38,7 @@
 
 <% elsif params[:id] == 'keys' %>
 
-  <h1>Keys owned by <%= resque %></h1>
+  <h1>Keys owned by <%= h resque.redis_id %></h1>
   <p class='sub'>(All keys are actually prefixed with "<%= Resque.redis.namespace %>:")</p>
   <table class='stats'>
     <tr>

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

@@ -21,7 +21,7 @@
         <td>
           <code><%= payload.key?('class') ? payload['class'] : "—" %></code>
         </td>
-        <td><%=h payload.key?('args') ? payload['args'].inspect : "—" %></td>
+        <td><pre><%=h payload.key?('args') ? show_args(payload['args']) : "—" %></pre></td>
       </tr>
   </table>
 

data/lib/resque/server.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'tilt/erb'
 require 'resque'
+require 'resque/server_helper'
 require 'resque/version'
 require 'time'
 require 'yaml'
@@ -11,8 +12,6 @@ end
 
 module Resque
   class Server < Sinatra::Base
-    require 'resque/server/helpers'
-
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/server/views"
@@ -26,117 +25,7 @@ module Resque
     set :static, true
 
     helpers do
-      include Rack::Utils
-      alias_method :h, :escape_html
-
-      def current_section
-        url_path request.path_info.sub('/','').split('/')[0].downcase
-      end
-
-      def current_page
-        url_path request.path_info.sub('/','')
-      end
-
-      def url_path(*path_parts)
-        [ url_prefix, path_prefix, path_parts ].join("/").squeeze('/')
-      end
-      alias_method :u, :url_path
-
-      def path_prefix
-        request.env['SCRIPT_NAME']
-      end
-
-      def class_if_current(path = '')
-        'class="current"' if current_page[0, path.size] == path
-      end
-
-      def tab(name)
-        dname = name.to_s.downcase
-        path = url_path(dname)
-        "<li #{class_if_current(path)}><a href='#{path}'>#{name}</a></li>"
-      end
-
-      def tabs
-        Resque::Server.tabs
-      end
-
-      def url_prefix
-        Resque::Server.url_prefix
-      end
-
-      def redis_get_size(key)
-        case Resque.redis.type(key)
-        when 'none'
-          []
-        when 'list'
-          Resque.redis.llen(key)
-        when 'set'
-          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, start=0)
-        case Resque.redis.type(key)
-        when 'none'
-          []
-        when 'list'
-          Resque.redis.lrange(key, start, start + 20)
-        when 'set'
-          Resque.redis.smembers(key)[start..(start + 20)]
-        when 'string'
-          [Resque.redis.get(key)]
-        when 'zset'
-          Resque.redis.zrange(key, start, start + 20)
-        end
-      end
-
-      def show_args(args)
-        Array(args).map do |a|
-          a.to_yaml
-        end.join("\n")
-      rescue
-        args.to_s
-      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
-
-      def partial(template, local_vars = {})
-        @partial = true
-        erb(template.to_sym, {:layout => false}, local_vars)
-      ensure
-        @partial = false
-      end
-
-      def poll
-        if defined?(@polling) && @polling
-          text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
-        else
-          text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll</a>"
-        end
-        "<p class='poll'>#{text}</p>"
-      end
-
+      include Resque::ServerHelper
     end
 
     def show(page, layout = true)
@@ -205,6 +94,11 @@ module Resque
       redirect u('failed')
     end
 
+    post "/failed/clear_retried" do
+      Resque::Failure.clear_retried
+      redirect u('failed')
+    end
+
     post "/failed/:queue/clear" do
       Resque::Failure.clear params[:queue]
       redirect u('failed')

data/lib/resque/server_helper.rb

@@ -0,0 +1,185 @@
+require 'rack/utils'
+
+module Resque
+  module ServerHelper
+    include Rack::Utils
+    alias_method :h, :escape_html
+
+    def current_section
+      url_path request.path_info.sub('/','').split('/')[0].downcase
+    end
+
+    def current_page
+      url_path request.path_info.sub('/','')
+    end
+
+    def url_path(*path_parts)
+      [ url_prefix, path_prefix, path_parts ].join("/").squeeze('/')
+    end
+    alias_method :u, :url_path
+
+    def path_prefix
+      request.env['SCRIPT_NAME']
+    end
+
+    def class_if_current(path = '')
+      'class="current"' if current_page[0, path.size] == path
+    end
+
+    def tab(name)
+      dname = name.to_s.downcase
+      path = url_path(dname)
+      "<li #{class_if_current(path)}><a href='#{path.gsub(" ", "_")}'>#{name}</a></li>"
+    end
+
+    def tabs
+      Resque::Server.tabs
+    end
+
+    def url_prefix
+      Resque::Server.url_prefix
+    end
+
+    def redis_get_size(key)
+      case Resque.redis.type(key)
+      when 'none'
+        0
+      when 'hash'
+        Resque.redis.hlen(key)
+      when 'list'
+        Resque.redis.llen(key)
+      when 'set'
+        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, start=0)
+      case Resque.redis.type(key)
+      when 'none'
+        []
+      when 'hash'
+        Resque.redis.hgetall(key).to_a[start..(start + 20)]
+      when 'list'
+        Resque.redis.lrange(key, start, start + 20)
+      when 'set'
+        Resque.redis.smembers(key)[start..(start + 20)]
+      when 'string'
+        [Resque.redis.get(key)]
+      when 'zset'
+        Resque.redis.zrange(key, start, start + 20)
+      end
+    end
+
+    def show_args(args)
+      Array(args).map do |a|
+        a.to_yaml
+      end.join("\n")
+    rescue
+      args.to_s
+    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
+
+    def partial(template, local_vars = {})
+      @partial = true
+      erb(template.to_sym, {:layout => false}, local_vars)
+    ensure
+      @partial = false
+    end
+
+    def poll
+      if defined?(@polling) && @polling
+        text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
+      else
+        text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll!!</a>"
+      end
+      "<p class='poll'>#{text}</p>"
+    end
+
+    ####################
+    #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 ||
+        (defined?(Resque::Failure::RedisMultiQueue) && Resque::Failure.backend == Resque::Failure::RedisMultiQueue)
+    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 - 1
+      end
+    end
+
+    def failed_order
+      params[:order] || 'desc'
+    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
+
+    def page_entries_info(start, stop, size, name = nil)
+      if size == 0
+        name ? "No #{name}s" : '<b>0</b>'
+      elsif size == 1
+        'Showing <b>1</b>' + (name ? " #{name}" : '')
+      elsif size > failed_per_page
+        "Showing #{start}-#{stop} of <b>#{size}</b>" + (name ? " #{name}s" : '')
+      else
+        "Showing #{start} to <b>#{size - 1}</b>" + (name ? " #{name}s" : '')
+      end
+    end
+  end
+end

data/lib/resque/stat.rb

@@ -35,8 +35,8 @@ module Resque
     #
     # Can optionally accept a second int parameter. The stat is then
     # incremented by that amount.
-    def incr(stat, by = 1)
-      data_store.increment_stat(stat,by)
+    def incr(stat, by = 1, **opts)
+      data_store.increment_stat(stat, by, **opts)
     end
 
     # Increments a stat by one.
@@ -58,8 +58,8 @@ module Resque
     end
 
     # Removes a stat from Redis, effectively setting it to 0.
-    def clear(stat)
-      data_store.clear_stat(stat)
+    def clear(stat, **opts)
+      data_store.clear_stat(stat, **opts)
     end
   end
 end

data/lib/resque/tasks.rb

@@ -16,7 +16,7 @@ namespace :resque do
     end
 
     worker.prepare
-    worker.log "Starting worker #{self}"
+    worker.log "Starting worker #{worker}"
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
 
@@ -39,7 +39,7 @@ namespace :resque do
 
   # Preload app files if this is Rails
   task :preload => :setup do
-    if defined?(Rails)
+    if defined?(Rails) && Rails.respond_to?(:application)
       if Rails.application.config.eager_load
         ActiveSupport.run_load_hooks(:before_eager_load, Rails.application)
         Rails.application.config.eager_load_namespaces.each(&:eager_load!)

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '2.0.0'
+  VERSION = '2.6.0'
 end