resque-history 1.8.2 → 1.9.0

data/Changelog.md

@@ -1,7 +1,13 @@
 Changelog
 =========
 
-## 1.7.0 (May 7, 2012)
+## 1.9.0 (May 9, 2012)
+
+Features:
+
+  - Record failed jobs
+
+## 1.8.2 (May 7, 2012)
 
 Features:
 

data/README.md

@@ -58,7 +58,9 @@ You have to load ResqueHistory to enable the History tab.
 Install
 =======
 
-    $ gem install resque-pause
+Add to your Gemfile
+
+    $ gem "resque-history"
     
 Add to routes.rb file
 

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.9.0

data/lib/resque-history/plugins/history.rb

@@ -9,6 +9,20 @@ module Resque
         @max_history ||= MAX_HISTORY_SIZE
       end
 
+      def on_failure_history(exception, *args)
+        Resque.redis.lpush(HISTORY_SET_NAME, {"class"=>"#{self}",
+                                              "time"=>Time.now.strftime("%Y-%m-%d %H:%M"),
+                                              "args"=>args,
+                                              "error"=>exception.message
+        }.to_json)
+
+        if Resque.redis.llen(HISTORY_SET_NAME) > maximum_history_size
+          Resque.redis.rpop(HISTORY_SET_NAME)
+        end
+
+      end
+
+
       def before_perform_hsitory(*args)
         @start_time = Time.now
       end

data/lib/resque-history/server/views/history.erb

@@ -11,25 +11,39 @@
 <% end %>
 
 <p class='intro'>Showing <%=start%> to <%= start + 20 %> of <b><%= size = Resque.redis.llen(Resque::Plugins::History::HISTORY_SET_NAME) %></b> jobs</p>
+<div id="main">
+  <%= partial :next_more, :start => params[:start].to_i, :size => size %>
 
-<%= partial :next_more, :start => params[:start].to_i, :size => size %>
+  <table>
+    <tr>
+      <th>Job</th>
+      <th>Arguments</th>
+      <th>Time</th>
+      <th>Execution</th>
+    </tr>
+    <% history.each do |history| %>
+        <% j = JSON.parse(history) %>
+        <tr class='<%= j["error"].nil? ? "" : "failure" %>' >
+          <td class='queue'><%= j["class"] %></td>
+          <td class='args'><%= j["args"] %></td>
+          <td class='args'><%= j["time"] %></td>
+          <td class='args'><%= format_execution(j["execution"]) %></td>
+        </tr>
+    <% end %>
+  </table>
 
-<table class='queues1'>
-  <tr>
-    <th>Job</th>
-    <th>Arguments</th>
-    <th>Time</th>
-    <th>Execution</th>
-  </tr>
-  <% history.each do |history| %>
-      <% j = JSON.parse(history) %>
-      <tr>
-        <td class='queue'><%= j["class"] %></td>
-        <td class='args'><%= j["args"] %></td>
-        <td class='args'><%= j["time"] %></td>
-        <td class='args'><%= format_execution(j["execution"]) %></td>
-      </tr>
-  <% end %>
-</table>
+  <%= partial :next_more, :start => start, :size => size %>
+</div>
 
-<%= partial :next_more, :start => start, :size => size %>
+<style type="text/css">
+    #main table tr.failure td {
+        background: #ffecec;
+        border-top: 2px solid #d37474;
+        font-size: 90%;
+        color: #d37474;
+    }
+
+    #main table tr.failure td a {
+        color: #d37474;
+    }
+</style>

data/resque-history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-history"
-  s.version = "1.8.2"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Katzmopolitan"]
-  s.date = "2012-05-07"
+  s.date = "2012-05-09"
   s.description = "Show history of recently executed jobs"
   s.email = "ilyakatz@gmail.com"
   s.extra_rdoc_files = [

data/spec/resque-history/plugins/history_spec.rb

@@ -19,6 +19,7 @@ class MaxHistoryJob
 end
 
 describe Resque::Plugins::History do
+
   it "should be compliance with Resqu::Plugin document" do
     expect { Resque::Plugin.lint(Resque::Plugins::History) }.to_not raise_error
   end
@@ -171,6 +172,24 @@ describe Resque::Plugins::History do
 
     end
 
+    it "should record failed jobs" do
+
+      Resque.enqueue(ExceptionJob,"nothing")
+
+      job = Resque.reserve('test')
+
+      lambda { job.perform }.should raise_exception
+      arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
+
+
+      arr.count.should == 1
+
+      JSON.parse(arr.first)["class"].should =="ExceptionJob"
+      JSON.parse(arr.first)["args"].should == ["nothing"]
+      JSON.parse(arr.first)["execution"].should == nil
+      JSON.parse(arr.first)["error"].should == "I'm an error"
+    end
+
   end
 
 end
@@ -192,3 +211,12 @@ class SleepyHistoryJob
     sleep(time_in_seconds)
   end
 end
+
+class ExceptionJob
+  extend Resque::Plugins::History
+  @queue = :test
+
+  def self.perform(arg)
+    raise StandardError, "I'm an error"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-history
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-history