dj_mon 0.0.6 → 0.1.0

data/README.md

@@ -16,6 +16,9 @@ Or install it yourself as:
 
     $ gem install dj_mon
 
+## Note
+Supports only `activerecord` for now.
+
 ## Usage
 
 If you are using Rails =< 3.1, or if `config.assets.initialize_on_precompile` is set to false, then add this to `config/environments/production.rb`.
@@ -32,13 +35,15 @@ This uses http basic auth for authentication. Set the credentials in an initiali
     YourApp::Application.config.dj_mon.password = "password"
     
 If the credentials are not set, then the username and password are assumed to be the above mentioned.
-  
+
 Now visit `http://localhost:3000/dj_mon` and profit!
 
-## Features
-* See Jobs by status
-* Inspect the payload
-* Inspect the last run error.
+## Demo
+* Source [DJ Mon](https://github.com/akshayrawat/dj_mon)
+* URL:     [Demo](http://dj-mon-demo.herokuapp.com/)
+* Username: `dj_mon`
+* Password: `password`
+
 
 ## ROADMAP
 * Delete failed or queued jobs
@@ -53,4 +58,4 @@ Now visit `http://localhost:3000/dj_mon` and profit!
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/app/assets/javascripts/dj_mon.js

@@ -29,8 +29,8 @@ $(function(){
   });
 
   $('a[rel=modal]').live('click', function(){
-    var template = $('#last_error_template').html();
-    var output = Mustache.render(template, { last_error: $(this).data('content') });
+    var template = $($(this).attr('href')).html();
+    var output = Mustache.render(template, { content: $(this).data('content') });
     $(output).appendTo($('body')).show();
   });
 

data/app/assets/stylesheets/dj_mon.css

@@ -4,16 +4,16 @@ body {
   padding: 90px;
 }
 
-table.table td, table.table th {
+table#jobs-table td, table#jobs-table th {
   text-align: center;
 }
 
-table.table td.date, table.table th.date {
+table#jobs-table td.date, table#jobs-table th.date {
   text-align: left;
 }
 
-table.table td.date {
-  font-size: 90%;
+table#jobs-table td.date {
+  font-size: 80%;
 }
 
 .centered {
@@ -24,6 +24,7 @@ code.block {
   display: block;
   word-wrap: break-word;
 }
+
 #dj-counts-view {
   position: relative;
   top: 12px;
@@ -33,4 +34,4 @@ code.block {
 #dj-counts-view .badge {
   float: right;
   margin: 0 2px;
-}
+}

data/app/controllers/dj_mon/dj_reports_controller.rb

@@ -27,6 +27,10 @@ module DjMon
     def dj_counts
       respond_with DjReport.dj_counts
     end
+    
+    def settings
+      respond_with DjReport.settings
+    end
 
     protected
 

data/app/models/dj_mon/dj_report.rb

@@ -1,7 +1,8 @@
 module DjMon
   class DjReport
+
     attr_accessor :delayed_job
-    
+
     def initialize delayed_job
       self.delayed_job = delayed_job
     end
@@ -12,12 +13,12 @@ module DjMon
         payload: delayed_job.payload_object.object.to_yaml,
         priority: delayed_job.priority,
         attempts: delayed_job.attempts,
-        queue: delayed_job.queue,
+        queue: delayed_job.queue || "global",
         last_error_summary: delayed_job.last_error.to_s.truncate(30),
         last_error: delayed_job.last_error,
-        failed_at: l_date(delayed_job.failed_at),
-        run_at: l_date(delayed_job.run_at),
-        created_at: l_date(delayed_job.created_at)
+        failed_at: l_datetime(delayed_job.failed_at),
+        run_at: l_datetime(delayed_job.run_at),
+        created_at: l_datetime(delayed_job.created_at)
       }
     end
 
@@ -32,7 +33,7 @@ module DjMon
       end
 
       def active
-        Delayed::Job.where('delayed_jobs.locked_by IS NOT NULL')
+        Delayed::Job.where('delayed_jobs.failed_at IS NULL AND delayed_jobs.locked_by IS NOT NULL')
       end
 
       def queued
@@ -67,12 +68,22 @@ module DjMon
         }
       end
 
+      def settings
+        {
+          destroy_failed_jobs: Delayed::Worker.destroy_failed_jobs,
+          sleep_delay:         Delayed::Worker.sleep_delay,
+          max_attempts:        Delayed::Worker.max_attempts,
+          max_run_time:        Delayed::Worker.max_run_time,
+          read_ahead:          Delayed::Worker.read_ahead,
+          delay_jobs:          Delayed::Worker.delay_jobs
+        }
+      end
     end
 
     private
-
-    def l_date date
+    def l_datetime date
       date.present? ? I18n.l(date) : ""
     end
   end
-end
+
+end

data/app/views/dj_mon/dj_reports/index.html.haml

@@ -1,34 +1,32 @@
-%header
-  %p.lead Delayed Jobs
-  .subnav
-    %ul.nav.nav-tabs
-      %li.active
-        = link_to "All", "#all", "data-toggle" => "tab"
-      %li
-        = link_to "Failed", "#failed", "data-toggle" => "tab"
-      %li
-        = link_to "Queued", "#queued", "data-toggle" => "tab"
-      %li
-        = link_to "Active", "#active", "data-toggle" => "tab"
+%p.lead Delayed Jobs
+%ul.nav.nav-tabs
+  %li.active
+    = link_to "All", "#all", "data-toggle" => "tab"
+  %li
+    = link_to "Failed", "#failed", "data-toggle" => "tab"
+  %li
+    = link_to "Queued", "#queued", "data-toggle" => "tab"
+  %li
+    = link_to "Active", "#active", "data-toggle" => "tab"
 
-    .tab-content
-      .tab-pane#all.active{ 'data-url'   => all_dj_reports_url }
-      .tab-pane#failed{ 'data-url'=> failed_dj_reports_url }
-      .tab-pane#active{ 'data-url'=> active_dj_reports_url }
-      .tab-pane#queued{ 'data-url'=> queued_dj_reports_url }
+.tab-content
+  .tab-pane#all.active{ 'data-url'   => all_dj_reports_url }
+  .tab-pane#failed{ 'data-url'=> failed_dj_reports_url }
+  .tab-pane#active{ 'data-url'=> active_dj_reports_url }
+  .tab-pane#queued{ 'data-url'=> queued_dj_reports_url }
 
 %script#dj_reports_template{ :type=> "text/x-handlebars-template" }
-  %table.table.table-striped
+  %table.table.table-striped#jobs-table
     %thead
       %tr
+        %th
+          Queue
         %th
           ID
         %th
           Priority
         %th
           Attempts
-        %th
-          Queue
         %th
           Last Error
         %th.date
@@ -40,6 +38,9 @@
     %tbody
       {{#.}}
       %tr
+        %td
+          .label.label-info
+            {{queue}}
         %td
           <a href="#" data-content="<code class='block'>{{payload}}</code>" rel='popover' title='Payload'> {{id}} </a>
         %td
@@ -47,19 +48,17 @@
         %td
           {{attempts}}
         %td
-          {{queue}}
-        %td
-          <a href="#" data-content="{{last_error}}" rel='modal' title='Last Error'> {{last_error_summary}} </a>
+          <a href="#last_error_template" data-content="{{last_error}}" rel='modal' title='Last Error'> {{last_error_summary}} </a>
         %td.date
           {{failed_at}}
         %td.date
-          {{job.run_at}}
+          {{run_at}}
         %td.date
           {{created_at}}
       {{/.}}
 
 %script#last_error_template{ :type=> "text/x-handlebars-template" }
-  .modal.hide#last_error_modal
+  .modal.hide
     .modal-header
       %button{ type: "button", class: "close", 'data-dismiss' => "modal" }
         ×
@@ -67,6 +66,6 @@
         Last Error
     .modal-body
       %code
-        {{last_error}}
+        {{content}}
     .modal-footer
-      = link_to "Close", '#', class: 'btn btn-primary', 'data-dismiss'=> 'modal'
+      = link_to "Close", '#', class: 'btn btn-primary', 'data-dismiss'=> 'modal'

data/app/views/layouts/dj_mon.html.haml

@@ -11,6 +11,9 @@
           .container
             .pull-left
               = link_to "DJ Mon", dj_reports_url, class: "brand"
+            .pull-right
+              = link_to "Settings", "#dj_settings_template", rel: 'modal', 'data-content'=> "#{DjMon::DjReport.settings.to_json}", id: 'settings', class: 'btn btn-primary btn-mini'
+
             .pull-right
               #dj-counts-view
 
@@ -21,9 +24,53 @@
     = javascript_include_tag "dj_mon.js"
 
     %script#dj_counts_template{ :type=> "text/x-handlebars-template" }
-      %span.badge.badge-warning
-        {{active}} active
-      %span.badge.badge-info
+      %span.badge
         {{queued}} queued
-      %span.badge.badge-important
+      %span.badge.badge-info
+        {{active}} active
+      %span.badge.badge-warning
         {{failed}} failed
+
+    %script#dj_settings_template{ :type=> "text/x-handlebars-template" }
+      .modal.hide
+        .modal-header
+          %button{ type: "button", class: "close", 'data-dismiss' => "modal" }
+            ×
+          %h3
+            Delayed Job Settings
+        .modal-body
+          %table.table.table-bordered.table-striped
+            %tr
+              %td
+                Destroy failed jobs:
+              %td
+                <code>{{content.destroy_failed_jobs}}</code>
+            %tr
+              %td
+                Sleep delay: 
+              %td
+                <code>{{content.sleep_delay}}</code> seconds
+            %tr
+              %td
+                Max attempts:
+              %td
+                <code>{{content.max_attempts}}</code>
+            %tr
+              %td
+                Max run time:
+              %td
+                <code>{{content.max_run_time}}</code> seconds
+            %tr
+              %td
+                Read ahead:
+              %td
+                <code>{{content.read_ahead}}</code>
+            %tr
+              %td
+                Delay Jobs:
+              %td
+                <code>{{content.delay_jobs}}</code>
+
+        .modal-footer
+          = link_to "Close", '#', class: 'btn btn-primary', 'data-dismiss'=> 'modal'
+

data/config/routes.rb

@@ -7,6 +7,7 @@ DjMon::Engine.routes.draw do
       get :active
       get :queued
       get :dj_counts
+      get :settings
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dj_mon
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: