delayed_job_dashboard 0.2.1 → 0.2.2

data/README.rdoc

@@ -32,7 +32,7 @@ Since the DJ Workers run in a completely different process, there is no practica
 connect to those threads and interupt them
 === Can I manipulate pending jobs?
 Until there's a practical security model for the dashboard, it won't facilitate being a backdoor for
-hackers to mess with your application. Until then, <tt>rails console</tt> is your fried.
+hackers to mess with your application. Until then, <tt>rails console</tt> is your friend.
 === What do the states mean? DJ doesn't have those states...
 The dashboard tries to give a view into the different records in your delayed_jobs table
 * running: records with a "locked_by", indicating a worker has reserved it and it is running

data/app/controllers/delayed_jobs_controller.rb

@@ -8,39 +8,54 @@ class DelayedJobsController < ActionController::Base
       @job = Delayed::Job.find(params[:id])
       render :layout =>nil
     rescue ActiveRecord::RecordNotFound => rnf
-      render :text =>"Not found, maybe it finished?"
-      return
-
-    #handle Exception => e
-    #  puts e
-    #rescue
-    #  #  render :text =>"Not found, maybe it finished?"
-    #  #  return
+      render :text => "Not found, maybe it finished?"
     end
   end
   def counts
-    @wip_counts = Delayed::Job.where("locked_by is not null").length
-    @failing_counts = Delayed::Job.where("attempts > 1").length
-    @overdue_counts = Delayed::Job.where("run_at < ?", Time.now).length
-    @future_counts = Delayed::Job.where("run_at >= ?", Time.now).length
+    @wip_counts     = wip_jobs.count
+    @failing_counts = failing_jobs.count
+    @overdue_counts = overdue_jobs.count
+    @future_counts  = future_jobs.count
   end
 
   def wip
-    @jobs = Delayed::Job.where("locked_by is not null")
+    @jobs = wip_jobs
     render :layout =>nil
   end
   def failing
-    @jobs = Delayed::Job.where("attempts > 1")
+    @jobs = failing_jobs
     render :layout =>nil
-
   end
   def overdue
-    @jobs = Delayed::Job.where("run_at < ?", Time.now)
+    @jobs = overdue_jobs
     render :layout =>nil
   end
   def future
-    @jobs = Delayed::Job.where("run_at >= ?", Time.now)
+    @jobs = future_jobs
     render :layout =>nil
+  end
+
+  private
 
+  def wip_jobs
+    Delayed::Job.
+      where("locked_by is not null").
+      where("attempts < ?", Delayed::Worker.max_attempts)
+  end
+  def failing_jobs
+    Delayed::Job.
+      where("attempts >= 1").
+      where("locked_by is null").
+      where("failed_at is not null")
+  end
+  def overdue_jobs
+    Delayed::Job.
+      where("run_at < ?", Time.now).
+      where("locked_by is null").
+      where("failed_at is null")
+  end
+  def future_jobs
+    Delayed::Job.
+      where("run_at >= ?", Time.now)
   end
-end
+end

data/app/views/delayed_jobs/failing.html.haml

@@ -4,6 +4,7 @@
   %table.label_top
     %thead
       %tr
+        %th Priority
         %th Name
         %th Attempts
         %th Run at
@@ -13,11 +14,10 @@
     %tbody
       - @jobs.each do |job|
         %tr
+          %td= job.priority
           %td= link_to "#{job.name} ##{job.id}", "javascript:open_job('#{delayed_job_dashboard.delayed_job_path(job)}')"
           %td
             = job.attempts
           %td= job.run_at
           %td= job.created_at
           %td= job.updated_at
-
-

data/app/views/delayed_jobs/future.html.haml

@@ -4,6 +4,7 @@
   %table.label_top
     %thead
       %tr
+        %th Priority
         %th Name
         %th Run at
         %th created
@@ -11,6 +12,7 @@
     %tbody
       - @jobs.each do |job|
         %tr
+          %td= job.priority
           %td= link_to "#{job.name} ##{job.id}", "javascript:open_job('#{delayed_job_dashboard.delayed_job_path(job)}')"
           %td
             = job.run_at
@@ -18,5 +20,3 @@
             = time_ago_in_words(job.run_at)
             )
           %td= job.created_at
-
-

data/app/views/delayed_jobs/overdue.html.haml

@@ -4,6 +4,7 @@
   %table.label_top
     %thead
       %tr
+        %th Priority
         %th Name
         %th Run at
         %th created
@@ -11,6 +12,7 @@
     %tbody
       - @jobs.each do |job|
         %tr
+          %td= job.priority
           %td= link_to "#{job.name} ##{job.id}", "javascript:open_job('#{delayed_job_dashboard.delayed_job_path(job)}')"
           %td
             = job.run_at
@@ -19,5 +21,3 @@
             ago
             )
           %td= job.created_at
-
-

data/app/views/delayed_jobs/show.html.haml

@@ -6,6 +6,9 @@
   %tr
     %th Name
     %td= @job.name
+  %tr
+    %th Priority
+    %td= @job.priority
   %tr
     %th Attempts
     %td= @job.attempts

data/app/views/delayed_jobs/wip.html.haml

@@ -4,6 +4,7 @@
   %table.label_top
     %thead
       %tr
+        %th Priority
         %th Name
         %th Attempts
         %th Age
@@ -13,10 +14,10 @@
     %tbody
       - @jobs.each do |job|
         %tr
+          %td= job.priority
           %td= link_to "#{job.name} ##{job.id}", "javascript:open_job('#{delayed_job_dashboard.delayed_job_path(job)}')"
           %td
             = job.attempts
           %td= time_ago_in_words(job.locked_at)
           %td= job.locked_by
           %td= job.created_at
-

data/lib/delayed_job_dashboard/version.rb

@@ -1,3 +1,3 @@
 module DelayedJobDashboard
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_dashboard
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 Z
+date: 2012-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -23,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A dashboard for delayed_job.