resque-job_history 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5bff0c1faf1c5b7320a96c5b085e8baf35b712
-  data.tar.gz: 4ada6c6a3fc999730bba715e840285e1e6b9dfd1
+  metadata.gz: 0c3f478df1a3604bb27c14414e3ed7ffbfc34dde
+  data.tar.gz: 9b0d78e32b57b098cd8150747372df8bbf203600
 SHA512:
-  metadata.gz: 7510483ab78cdd4571de32e388235a654d7c1afa71eac5dc28f951eca1c34401b6dcd84b6715907c24346d7579146f198a7e3b885952733d592294d68f822c1a
-  data.tar.gz: e75083c6ae8aaf7141ad8541127bd44368876c7e797b0b930101f5d5da0243f8f26e611a31206f341eb0c3ee4feecdf09464137ec83db213d5e1bfffa585c41f
+  metadata.gz: 1fcb4e9aa99d234359507f689cc329f311b5c98f3f2d61864f37ae40dd2aa616b79ccf20b36421839a71fd8412acdb7a204511c7cf44098f47aef44edb6f9526
+  data.tar.gz: f610d895c93dfeeb2eeb29e71c2c96a47e414a768da3606bfd39c5f3e062f81b84a6c07ab8411523ccb2d6a689eb8a6e7aba2b1be9a211a024be6463ef68ff3f

data/lib/resque/plugins/job_history/history_details.rb

@@ -80,10 +80,30 @@ module Resque
           redis.get(total_failed_key).to_i
         end
 
+        def num_running_jobs
+          running_jobs.num_jobs
+        end
+
+        def num_finished_jobs
+          finished_jobs.num_jobs
+        end
+
+        def total_run_jobs
+          running_jobs.total
+        end
+
+        def total_finished_jobs
+          finished_jobs.total
+        end
+
         def class_name_valid?
           described_class.present?
         end
 
+        def last_run
+          running_jobs.latest_job || finished_jobs.latest_job
+        end
+
         def clean_old_running_jobs
           too_old_time = class_purge_age.ago
 
@@ -104,6 +124,8 @@ module Resque
         private
 
         def described_class
+          return if class_name.blank?
+
           class_name.constantize
         rescue StandardError
           nil
@@ -113,6 +135,10 @@ module Resque
           described_class.try(:purge_age) || 24.hours
         end
 
+        def class_exclude_from_linear_history
+          described_class.try(:exclude_from_linear_history) || false
+        end
+
         def class_history_len
           hist_len = described_class.try(:job_history_len) || MAX_JOB_HISTORY
           hist_len.negative? ? 0 : hist_len

data/lib/resque/plugins/job_history/job.rb

@@ -27,7 +27,7 @@ module Resque
         end
 
         def succeeded?
-          finished? && error.blank?
+          error.blank?
         end
 
         def duration
@@ -48,7 +48,7 @@ module Resque
 
         def start(*args)
           num_jobs = running_jobs.add_job(job_id, class_name)
-          linear_jobs.add_job(job_id, class_name)
+          linear_jobs.add_job(job_id, class_name) unless class_exclude_from_linear_history
 
           record_job_start(*args)
           record_num_jobs(num_jobs)
@@ -105,14 +105,14 @@ module Resque
           reset
         end
 
+        private
+
         def remove_from_job_lists
           running_jobs.remove_job(job_id)
           finished_jobs.remove_job(job_id)
           linear_jobs.remove_job(job_id)
         end
 
-        private
-
         def record_job_start(*args)
           redis.hset(job_key, "start_time", Time.now.utc.to_s)
           redis.hset(job_key, "args", encode_args(*args))

data/lib/resque/plugins/job_history/job_list.rb

@@ -37,58 +37,42 @@ module Resque
           redis.smembers(Resque::Plugins::JobHistory::HistoryDetails.job_history_key)
         end
 
-        def job_class_summary(class_name)
-          history = Resque::Plugins::JobHistory::HistoryDetails.new(class_name)
-
-          running_list  = history.running_jobs
-          finished_list = history.finished_jobs
-
-          class_summary_hash(class_name, finished_list, running_list)
+        def job_details(class_name)
+          Resque::Plugins::JobHistory::HistoryDetails.new(class_name)
         end
 
         private
 
-        def latest_job(running_list, finished_list)
-          running_list.latest_job || finished_list.latest_job
-        end
-
         def sorted_job_summaries(sort_key)
-          job_classes.map { |class_name| job_class_summary(class_name) }.sort_by do |job_summary|
-            summary_sort_value(job_summary, sort_key)
+          job_classes.map { |class_name| job_details(class_name) }.sort_by do |job_details|
+            summary_sort_value(job_details, sort_key)
           end
         end
 
-        def summary_sort_value(job_summary, sort_key)
+        def summary_sort_value(job_details, sort_key)
           case sort_key.to_sym
             when :class_name,
-                :running_jobs,
-                :finished_jobs,
+                :num_running_jobs,
+                :num_finished_jobs,
                 :total_finished_jobs,
                 :total_run_jobs,
-                :max_running_jobs
-              job_summary[sort_key.to_sym]
+                :max_concurrent_jobs
+              job_details.public_send sort_key
+            else
+              last_run_sort_value(job_details.last_run, sort_key)
+          end
+        end
+
+        def last_run_sort_value(last_run, sort_key)
+          case sort_key.to_sym
             when :start_time
-              job_summary[:last_run].start_time
+              last_run.start_time || Time.now
             when :duration
-              job_summary[:last_run].duration
+              last_run.duration
             when :success
-              job_summary[:last_run].succeeded? ? 1 : 0
+              last_run.succeeded? ? 1 : 0
           end
         end
-
-        def class_summary_hash(class_name, finished_list, running_list)
-          { class_name:          class_name,
-            class_name_valid:    running_list.class_name_valid?,
-            running_jobs:        running_list.num_jobs,
-            finished_jobs:       finished_list.num_jobs,
-            total_run_jobs:      running_list.total,
-            total_finished_jobs: finished_list.total,
-            max_concurrent_jobs: Resque::Plugins::JobHistory::HistoryDetails.new(class_name).
-                max_concurrent_jobs,
-            total_failed_jobs:   Resque::Plugins::JobHistory::HistoryDetails.new(class_name).
-                total_failed_jobs,
-            last_run:            latest_job(running_list, finished_list) }
-        end
       end
     end
   end

data/lib/resque/plugins/job_history.rb

@@ -70,6 +70,10 @@ module Resque
           @page_size ||= Resque::Plugins::JobHistory::PAGE_SIZE
         end
 
+        def exclude_from_linear_history
+          @exclude_from_linear_history ||= false
+        end
+
         def job_history
           Resque::Plugins::JobHistory::HistoryDetails.new(name)
         end

data/lib/resque/plugins/version.rb

@@ -3,7 +3,7 @@
 module Resque
   module Plugins
     module JobHistory
-      VERSION = "0.0.6"
+      VERSION = "0.0.8"
     end
   end
 end

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

@@ -24,14 +24,20 @@
         <tr<%= job_details.succeeded? ? "" : " class=\"job_history_error\"" %>>
           <td>
             <a href="job_details?class_name=<%= job_details.class_name %>&job_id=<%= job_details.job_id %>">
-              <%= time_ago_in_words(job_details.start_time) %> ago
-              (<%= job_details.start_time %>)
+              <% if job_details.start_time %>
+                <%= time_ago_in_words(job_details.start_time) %> ago
+                (<%= job_details.start_time %>)
+              <% else %>
+                Error - missing start time
+              <% end %>
             </a>
           </td>
           <td>
-            <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
-            <% if job_details.finished? %>
-              (<%= job_details.end_time %>)
+            <% if job_details.start_time %>
+              <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
+              <% if job_details.finished? %>
+                (<%= job_details.end_time %>)
+              <% end %>
             <% end %>
           </td>
           <td>

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

@@ -4,7 +4,7 @@
 
 <% job_list = Resque::Plugins::JobHistory::JobList.new %>
 <% history = Resque::Plugins::JobHistory::HistoryDetails.new(@job_class_name) %>
-<% class_info = job_list.job_class_summary(@job_class_name) %>
+<% class_info = job_list.job_details(@job_class_name) %>
 
 <p>
   <a href="<%= u("job history") %>">
@@ -19,7 +19,7 @@
         Running jobs
       </td>
       <td>
-        <%= class_info[:running_jobs].to_i %>
+        <%= class_info.num_running_jobs.to_i %>
       </td>
     </tr>
     <tr>
@@ -27,7 +27,7 @@
         Total jobs run
       </td>
       <td>
-        <%= class_info[:total_run_jobs].to_i %>
+        <%= class_info.total_run_jobs.to_i %>
       </td>
     </tr>
     <tr>
@@ -35,7 +35,7 @@
         Total jobs finished
       </td>
       <td>
-        <%= class_info[:total_finished_jobs].to_i %>
+        <%= class_info.total_finished_jobs.to_i %>
       </td>
     </tr>
     <tr>
@@ -43,7 +43,7 @@
         Total jobs in history
       </td>
       <td>
-        <%= class_info[:finished_jobs].to_i %>
+        <%= class_info.num_finished_jobs.to_i %>
       </td>
     </tr>
     <tr>
@@ -51,7 +51,7 @@
         Maximum number of consecutive jobs seen
       </td>
       <td>
-        <%= class_info[:max_running_jobs].to_i %>
+        <%= class_info.max_concurrent_jobs.to_i %>
       </td>
     </tr>
     <tr>
@@ -59,7 +59,7 @@
         Is still valid job
       </td>
       <td>
-        <%= class_info[:class_name_valid] %>
+        <%= class_info.class_name_valid? %>
       </td>
     </tr>
   </table>

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

@@ -23,8 +23,12 @@
         Started
       </td>
       <td>
-        <%= time_ago_in_words(job_details.start_time) %> ago
-        (<%= job_details.start_time %>)
+        <% if job_details.start_time %>
+          <%= time_ago_in_words(job_details.start_time) %> ago
+          (<%= job_details.start_time %>)
+        <% else %>
+          Error - missing start time
+        <% end %>
       </td>
     </tr>
     <tr>
@@ -32,9 +36,11 @@
         Duration
       </td>
       <td>
-        <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
-        <% if job_details.finished? %>
-          (<%= job_details.end_time %>)
+        <% if job_details.start_time %>
+          <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
+          <% if job_details.finished? %>
+            (<%= job_details.end_time %>)
+          <% end %>
         <% end %>
       </td>
     </tr>

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

@@ -23,11 +23,11 @@
                                            order_param("class_name", @sort_by, @sort_order) }.to_param %>">
         Class name
       </a></th>
-      <th><a href="job%20history?<%= { sort:      "running_jobs",
+      <th><a href="job%20history?<%= { sort:      "num_running_jobs",
                                        page_size: @page_size,
                                        page_num:  @page_num,
                                        order:     job_list.
-                                           order_param("running_jobs", @sort_by, @sort_order) }.to_param %>">
+                                           order_param("num_running_jobs", @sort_by, @sort_order) }.to_param %>">
         Running
       </a></th>
       <th><a href="job%20history?<%= { sort:      "total_run_jobs",
@@ -44,11 +44,11 @@
                                            order_param("total_finished_jobs", @sort_by, @sort_order) }.to_param %>">
         Finished
       </a></th>
-      <th><a href="job%20history?<%= { sort:      "max_running_jobs",
+      <th><a href="job%20history?<%= { sort:      "max_concurrent_jobs",
                                        page_size: @page_size,
                                        page_num:  @page_num,
                                        order:     job_list.
-                                           order_param("max_running_jobs", @sort_by, @sort_order) }.to_param %>">
+                                           order_param("max_concurrent_jobs", @sort_by, @sort_order) }.to_param %>">
         Max Running
       </a></th>
       <th><a href="job%20history?<%= { sort:      "start_time",
@@ -75,42 +75,42 @@
     </tr>
 
     <% job_list.job_summaries(@sort_by, @sort_order, @page_num, @page_size).each do |class_info| %>
-      <tr<%= class_info[:last_run] && !class_info[:last_run].succeeded? ? " class=\"job_history_error\"" : "" %>>
+      <tr<%= class_info.last_run && !class_info.last_run.succeeded? ? " class=\"job_history_error\"" : "" %>>
         <td>
-          <a href="job%20history/job_class_details?class_name=<%= class_info[:class_name] %>">
-            <%= class_info[:class_name] %>
+          <a href="job%20history/job_class_details?class_name=<%= class_info.class_name %>">
+            <%= class_info.class_name %>
           </a>
         </td>
         <td>
-          <%= class_info[:running_jobs].to_i %>
+          <%= class_info.num_running_jobs.to_i %>
         </td>
         <td>
-          <%= class_info[:total_run_jobs].to_i %>
+          <%= class_info.total_run_jobs.to_i %>
         </td>
         <td>
-          <%= class_info[:total_finished_jobs].to_i %>
+          <%= class_info.total_finished_jobs.to_i %>
         </td>
         <td>
-          <%= class_info[:max_running_jobs].to_i %>
+          <%= class_info.max_concurrent_jobs.to_i %>
         </td>
         <td>
-          <% if class_info[:last_run] && class_info[:last_run].start_time %>
-            <%= time_ago_in_words(class_info[:last_run].start_time) %> ago
-            (<%= class_info[:last_run].start_time %>)
+          <% if class_info.last_run && class_info.last_run.start_time %>
+            <%= time_ago_in_words(class_info.last_run.start_time) %> ago
+            (<%= class_info.last_run.start_time %>)
           <% end %>
         </td>
         <td>
-          <% if class_info[:last_run] %>
-            <% if class_info[:last_run].finished? %>
-              <%= distance_of_time_in_words(class_info[:last_run].start_time, class_info[:last_run].end_time) %>
-              (<%= class_info[:last_run].end_time %>)
+          <% if class_info.last_run %>
+            <% if class_info.last_run.finished? %>
+              <%= distance_of_time_in_words(class_info.last_run.start_time, class_info.last_run.end_time) %>
+              (<%= class_info.last_run.end_time %>)
             <% else %>
               Still running...
             <% end %>
           <% end %>
         </td>
         <td>
-          <% if class_info[:last_run] && !class_info[:last_run].succeeded? %>
+          <% if class_info.last_run && !class_info.last_run.succeeded? %>
             No
           <% else %>
             Yes

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

@@ -34,11 +34,15 @@
             </a>
           </td>
           <td>
-            <%= time_ago_in_words(job_details.start_time) %> ago
-            (<%= job_details.start_time %>)
+            <% if job_details.start_time %>
+              <%= time_ago_in_words(job_details.start_time) %> ago
+              (<%= job_details.start_time %>)
+            <% else %>
+              Error - missing start time
+            <% end %>
           </td>
           <td>
-            <%= distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
+            <%# = distance_of_time_in_words(job_details.start_time, (job_details.end_time || Time.now)) %>
             <% if job_details.finished? %>
               (<%= job_details.end_time %>)
             <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - RealNobody