nfo-resque-mongo 1.15.1 → 1.17.1

data/lib/resque/failure/hoptoad.rb

@@ -1,6 +1,8 @@
-require 'net/https'
-require 'builder'
-require 'uri'
+begin
+  require 'hoptoad_notifier'
+rescue LoadError
+  raise "Can't find 'hoptoad_notifier' gem. Please add it to your Gemfile or install it."
+end
 
 module Resque
   module Failure
@@ -10,27 +12,20 @@ module Resque
     #
     #   require 'resque/failure/hoptoad'
     #
-    #   Resque::Failure::Hoptoad.configure do |config|
-    #     config.api_key = 'blah'
-    #     config.secure = true
+    #   Resque::Failure::Multiple.classes = [Resque::Failure::Redis, Resque::Failure::Hoptoad]
+    #   Resque::Failure.backend = Resque::Failure::Multiple
     #
-    #     # optional proxy support
-    #     config.proxy_host = 'x.y.z.t'
-    #     config.proxy_port = 8080
+    # Once you've configured resque to use the Hoptoad failure backend,
+    # you'll want to setup an initializer to configure the Hoptoad.
     #
-    #     # server env support, defaults to RAILS_ENV or RACK_ENV
-    #     config.server_environment = "test"
-    #   end
+    # HoptoadNotifier.configure do |config|
+    #   config.api_key = 'your_key_here'
+    # end
+    # For more information see https://github.com/thoughtbot/hoptoad_notifier
     class Hoptoad < Base
-      # From the hoptoad plugin
-      INPUT_FORMAT = /^([^:]+):(\d+)(?::in `([^']+)')?$/
-
-      class << self
-        attr_accessor :secure, :api_key
-        attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_pass
-        attr_accessor :server_environment
-        attr_accessor :host, :port
-        attr_accessor :http_read_timeout, :http_open_timeout
+      def self.configure(&block)
+        Resque::Failure.backend = self
+        HoptoadNotifier.configure(&block)
       end
 
       def self.count
@@ -39,101 +34,15 @@ module Resque
         Stat[:failed]
       end
 
-      def self.configure
-        yield self
-        Resque::Failure.backend = self
-      end
-
       def save
-        http = use_ssl? ? :https : :http
-        host = self.class.host || 'hoptoadapp.com'
-        port = self.class.port
-        url = URI.parse("#{http}://#{host}:#{port}/notifier_api/v2/notices/")
-
-        request = Net::HTTP::Proxy self.class.proxy_host, self.class.proxy_port,
-                                   self.class.proxy_user, self.class.proxy_pass
-        http = request.new(url.host, url.port)
-        headers = {
-          'Content-type' => 'text/xml',
-          'Accept' => 'text/xml, application/xml'
-        }
-
-        http.read_timeout = self.class.http_read_timeout || 5 # seconds
-        http.open_timeout = self.class.http_open_timeout || 2 # seconds
-
-        http.use_ssl = use_ssl?
-
-        begin
-          response = http.post(url.path, xml, headers)
-        rescue TimeoutError => e
-          log "Timeout while contacting the Hoptoad server."
-        end
-
-        case response
-        when Net::HTTPSuccess then
-          log "Hoptoad Success: #{response.class}"
-        else
-          body = response.body if response.respond_to? :body
-          log "Hoptoad Failure: #{response.class}\n#{body}"
-        end
+        HoptoadNotifier.notify_or_ignore(exception,
+          :parameters => {
+            :payload_class => payload['class'].to_s,
+            :payload_args => payload['args'].inspect
+          }
+        )
       end
 
-      def xml
-        x = Builder::XmlMarkup.new
-        x.instruct!
-        x.notice :version=>"2.0" do
-          x.tag! "api-key", api_key
-          x.notifier do
-            x.name "Resqueue"
-            x.version "0.1"
-            x.url "http://github.com/defunkt/resque"
-          end
-          x.error do
-            x.tag! "class", exception.class.name
-            x.message "#{exception.class.name}: #{exception.message}"
-            x.backtrace do
-              fill_in_backtrace_lines(x)
-            end
-          end
-          x.request do
-            x.url queue.to_s
-            x.component worker.to_s
-            x.params do
-              x.var :key=>"payload_class" do
-                x.text! payload["class"].to_s
-              end
-              x.var :key=>"payload_args" do
-                x.text! payload["args"].to_s
-              end
-            end
-          end
-          x.tag!("server-environment") do
-            x.tag!("environment-name",server_environment)
-            x.tag!("project-root", "RAILS_ROOT")
-          end
-
-        end
-      end
-
-      def fill_in_backtrace_lines(x)
-        Array(exception.backtrace).each do |unparsed_line|
-          _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a
-          x.line :file => file,:number => number
-        end
-      end
-
-      def use_ssl?
-        self.class.secure
-      end
-
-      def api_key
-        self.class.api_key
-      end
-
-      def server_environment
-        return self.class.server_environment if self.class.server_environment
-        defined?(RAILS_ENV) ? RAILS_ENV : (ENV['RACK_ENV'] || 'development')
-      end
     end
   end
 end

data/lib/resque/failure/mongo.rb

@@ -11,7 +11,7 @@ module Resque
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => exception.to_s,
-          :backtrace => Array(exception.backtrace),
+          :backtrace => filter_backtrace(Array(exception.backtrace)),
           :worker    => worker.to_s,
           :queue     => queue
         }
@@ -87,6 +87,11 @@ module Resque
         item = all(index)
         Resque.mongo_failures.remove(:_id => item['_id'])
       end
+      
+      def filter_backtrace(backtrace)
+        index = backtrace.index { |item| item.include?('/lib/resque/job.rb') }
+        backtrace.first(index.to_i)
+      end
     end
   end
 end

data/lib/resque/failure/multiple.rb

@@ -55,6 +55,10 @@ module Resque
       def self.requeue(*args)
         classes.first.requeue(*args)
       end
+
+      def self.remove(index)
+        classes.each { |klass| klass.remove(index) }
+      end
     end
   end
-end
+end

data/lib/resque/failure/redis.rb

@@ -0,0 +1,51 @@
+module Resque
+  module Failure
+    # A Failure backend that stores exceptions in Redis. Very simple but
+    # works out of the box, along with support in the Resque web app.
+    class Redis < Base
+      def save
+        data = {
+          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S"),
+          :payload   => payload,
+          :exception => exception.class.to_s,
+          :error     => exception.to_s,
+          :backtrace => filter_backtrace(Array(exception.backtrace)),
+          :worker    => worker.to_s,
+          :queue     => queue
+        }
+        data = Resque.encode(data)
+        Resque.redis.rpush(:failed, data)
+      end
+
+      def self.count
+        Resque.redis.llen(:failed).to_i
+      end
+
+      def self.all(start = 0, count = 1)
+        Resque.list_range(:failed, start, count)
+      end
+
+      def self.clear
+        Resque.redis.del(:failed)
+      end
+
+      def self.requeue(index)
+        item = all(index)
+        item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+        Resque.redis.lset(:failed, index, Resque.encode(item))
+        Job.create(item['queue'], item['payload']['class'], *item['payload']['args'])
+      end
+
+      def self.remove(index)
+        id = rand(0xffffff)
+        Resque.redis.lset(:failed, index, id)
+        Resque.redis.lrem(:failed, 1, id)
+      end
+
+      def filter_backtrace(backtrace)
+        index = backtrace.index { |item| item.include?('/lib/resque/job.rb') }
+        backtrace.first(index.to_i)
+      end
+    end
+  end
+end

data/lib/resque/helpers.rb

@@ -1,3 +1,11 @@
+require 'multi_json'
+
+# OkJson won't work because it doesn't serialize symbols
+# in the same way yajl and json do.
+if MultiJson.engine.to_s == 'MultiJson::Engines::OkJson'
+  raise "Please install the yajl-ruby or json gem"
+end
+
 module Resque
   # Methods used by various classes in Resque.
   module Helpers
@@ -23,29 +31,17 @@ module Resque
     # Given a Ruby object, returns a string suitable for storage in a
     # queue.
     def encode(object)
-      if defined? Yajl
-        Yajl::Encoder.encode(object)
-      else
-        object.to_json
-      end
+      ::MultiJson.encode(object)
     end
 
     # Given a string, returns a Ruby object.
     def decode(object)
       return unless object
 
-      if defined? Yajl
-        begin
-          Yajl::Parser.parse(object, :check_utf8 => false)
-        rescue Yajl::ParseError => e
-          raise DecodeException, e
-        end
-      else
-        begin
-          JSON.parse(object)
-        rescue JSON::ParserError => e
-          raise DecodeException, e
-        end
+      begin
+        ::MultiJson.decode(object)
+      rescue ::MultiJson::DecodeError => e
+        raise DecodeException, e
       end
     end
 

data/lib/resque/plugin.rb

@@ -47,5 +47,10 @@ module Resque
     def after_enqueue_hooks(job)
       job.methods.grep(/^after_enqueue/).sort
     end
+
+    # Given an object, returns a list `before_enqueue` hook names.
+    def before_enqueue_hooks(job)
+      job.methods.grep(/^before_enqueue/).sort
+    end
   end
 end

data/lib/resque/server.rb

@@ -2,6 +2,7 @@ require 'sinatra/base'
 require 'erb'
 require 'resque'
 require 'resque/version'
+require 'time'
 
 module Resque
   class Server < Sinatra::Base
@@ -118,6 +119,7 @@ module Resque
     end
 
     def show(page, layout = true)
+      response["Cache-Control"] = "max-age=0, private, must-revalidate"
       begin
         erb page.to_sym, {:layout => layout}, :resque => Resque
       rescue Errno::ECONNREFUSED
@@ -125,11 +127,27 @@ module Resque
       end
     end
 
+    def show_for_polling(page)
+      content_type "text/html"
+      @polling = true
+      show(page.to_sym, false).gsub(/\s{1,}/, ' ')
+    end
+
     # to make things easier on ourselves
     get "/?" do
       redirect url_path(:overview)
     end
 
+    %w( overview workers ).each do |page|
+      get "/#{page}.poll" do
+        show_for_polling(page)
+      end
+
+      get "/#{page}/:id.poll" do
+        show_for_polling(page)
+      end
+    end
+
     %w( overview queues working workers key ).each do |page|
       get "/#{page}" do
         show page
@@ -145,14 +163,6 @@ module Resque
       redirect u('queues')
     end
 
-    %w( overview workers ).each do |page|
-      get "/#{page}.poll" do
-        content_type "text/html"
-        @polling = true
-        show(page.to_sym, false).gsub(/\s{1,}/, ' ')
-      end
-    end
-
     get "/failed" do
       if Resque::Failure.url
         redirect Resque::Failure.url

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

@@ -59,7 +59,7 @@ body { padding:0; margin:0; }
 #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 { 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%; }
@@ -73,7 +73,7 @@ body { padding:0; margin:0; }
 #main ul.failed li.hover dl dd .retried .remove { display:block; }
 #main ul.failed li dl dd .controls { display:none; float:right; }
 #main ul.failed li.hover dl dd .controls { display:block; }
-#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 code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap;}
 #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;}
 

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

@@ -11,6 +11,7 @@
 <h1>Search Results</h1>
 <%end%>
 <% index = 0 %>
+<% date_format = "%Y/%m/%d %T %z" %>
 
 <%unless failed.empty?%>
 <form method="POST" action="<%=u 'failed/clear'%>" class="clear-failed" style="display: none">
@@ -35,10 +36,10 @@
         <% 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"><%= job['failed_at'] %></span></b>
+          <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"><%= job['retried_at'] %></span></b>
+              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 %>

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

@@ -4,7 +4,7 @@
 
   <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' />
+    <input type='submit' name='' value='Remove Queue' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
   </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'>

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

@@ -2,8 +2,13 @@
 
 <% if params[:key] %>
 
+  <h1>Not supported in resque-mongo yet</h1>
+<% if false %><!-- No supported in resque-mongo -->
+
 <%= partial resque.redis.type(params[:key]).eql?("string") ? :key_string : :key_sets %>
 
+<% end %>
+
 <% elsif params[:id] == "resque" %>
 
   <h1><%= resque %></h1>
@@ -22,6 +27,9 @@
 
 <% elsif params[:id] == 'redis' %>
 
+  <h1>Not supported in resque-mongo yet</h1>
+<% if false %><!-- No supported in resque-mongo -->
+
   <h1><%= resque.redis_id %></h1>
   <table class='stats'>
   <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
@@ -36,10 +44,14 @@
   <% end %>
   </table>
 
+<% end %>
+
 <% elsif params[:id] == 'keys' %>
 
+  <h1>Not supported in resque-mongo yet</h1>
+<% if false %><!-- No supported in resque-mongo -->
+
   <h1>Keys owned by <%= resque %></h1>
-  <p class='sub'>(All keys are actually prefixed with "<%= Resque.redis.namespace %>:")</p>
   <table class='stats'>
     <tr>
       <th>key</th>
@@ -57,6 +69,8 @@
   <% end %>
   </table>
 
+<% end %>
+
 <% else %>
 
 <% end %>