sidekiq_monitor 0.0.9 → 0.1.1

data/README.md

@@ -113,6 +113,15 @@ Sidekiq::Monitor.options[:graphs] = {
 
 `ALL` and `OTHER` are special keys: `ALL` will show all queues and `OTHER` will show all queues that aren't matched by the regex keys.
 
+#### Poll Interval
+
+The UI uses polling to update its data. By default, the polling interval is 3000ms, but you can adjust this like so:
+
+```ruby
+# config/initializers/sidekiq_monitor.rb
+Sidekiq::Monitor.options[:poll_interval] = 5000
+```
+
 ### Authentication
 
 You'll likely want to restrict access to this interface in a production setting. To do this, you can use routing constraints:

data/app/assets/javascripts/sidekiq/monitor/abstract_jobs_table.js.coffee

@@ -91,9 +91,21 @@ class SidekiqMonitor.AbstractJobsTable
 
     result_html = ''
     if status == 'failed'
+      rows_html = ''
+      for key, value of result
+        if key != 'message' && key != 'backtrace'
+          rows_html += "<tr><td>#{key}</td><td>#{JSON.stringify(value, null, 2)}</td></tr>"
+      if rows_html
+        rows_html = """
+          <h4>Result</h4>
+          <table class="table table-striped">
+            #{rows_html}
+          </table>
+        """
       result_html = """
         <h4>Error</h4>
         #{result.message}
+        #{rows_html}
         <h5>Backtrace</h5>
         <pre>
         #{result.backtrace.join("\n")}
@@ -180,7 +192,7 @@ class SidekiqMonitor.AbstractJobsTable
   start_polling: =>
     setInterval =>
       @on_poll()
-    , 3000
+    , SidekiqMonitor.settings.poll_interval
 
   format_time_ago: (time) =>
     if time?

data/app/assets/javascripts/sidekiq/monitor/graph.js.coffee

@@ -3,7 +3,7 @@ class SidekiqMonitor.Graph
   constructor: ->
     options =
       selector: '.graph'
-      poll_interval: 3000
+      poll_interval: SidekiqMonitor.settings.poll_interval
     @initialize(options)
 
   initialize: (options) =>

data/app/assets/javascripts/sidekiq/monitor/initialize.js.coffee.erb

@@ -4,3 +4,4 @@ window.SidekiqMonitor =
     api_url: (path) ->
       "<%= url_helpers.sidekiq_monitor_path %>api/#{path}"
     graphs: <%= Sidekiq::Monitor.options[:graphs].to_json %>
+    poll_interval: <%= Sidekiq::Monitor.options[:poll_interval] %>

data/app/models/sidekiq/monitor/job.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Monitor
     class Job < ActiveRecord::Base
-      attr_accessible :args, :class_name, :enqueued_at, :finished_at, :jid, :name, :queue, :result, :retry, :started_at, :status if ActiveRecord::VERSION::MAJOR < 4
+      attr_accessible :args, :class_name, :enqueued_at, :finished_at, :jid, :name, :queue, :result, :retry, :started_at, :status if ActiveRecord::VERSION::MAJOR < 4 || ActiveRecord.constants.include?(:MassAssignmentSecurity)
 
       serialize :args
       serialize :result

data/app/views/sidekiq/monitor/layouts/application.slim

@@ -26,4 +26,6 @@ html lang="en"
     .container
       = yield
 
-    = javascript_include_tag "sidekiq/monitor/application"
+    = javascript_include_tag "sidekiq/monitor/application"
+    - Sidekiq::Monitor.options[:javascripts].each do |javascript|
+      = javascript_include_tag javascript

data/lib/sidekiq/monitor/processor.rb

@@ -2,60 +2,25 @@ module Sidekiq
   module Monitor
     class Processor
       def queue(worker_class, item, queue)
-        args = item['args']
-        name = job_name(worker_class, args)
-        Sidekiq::Monitor::Job.find_or_create_by_jid(
-          jid: item['jid'],
-          queue: queue,
-          class_name: worker_class.is_a?(String) ? worker_class : worker_class.name,
-          args: args,
-          retry: item['retry'],
-          enqueued_at: DateTime.now,
-          status: 'queued',
-          name: name
-        )
+        job = find_or_initialize_job(worker_class, item, queue)
+        job.save
       end
 
-      def start(worker, msg, queue)
-        jid = msg['jid']
-        args = msg['args']
-        now = DateTime.now
-        job = Sidekiq::Monitor::Job.find_by_jid(jid)
-        if job.blank?
-          name = job_name(worker.class, args)
-          job = Sidekiq::Monitor::Job.new(
-            jid: jid,
-            queue: queue,
-            class_name: worker.class.name,
-            args: args,
-            retry: msg['retry'],
-            enqueued_at: now,
-            name: name
-          )
-        end
+      def start(worker, item, queue)
+        job = find_or_initialize_job(worker, item, queue)
         job.update_attributes(
-          started_at: now,
+          started_at: DateTime.now,
           status: 'running'
         )
       end
 
-      def error(worker, msg, queue, exception)
-        result = {
-          message: "#{exception.class.name}: #{exception.message}",
-          backtrace: exception.backtrace
-        }
-        job = find_job(msg)
-        return unless job
-        job.update_attributes(
-          finished_at: DateTime.now,
-          status: 'failed',
-          result: result
-        )
+      def error(worker, item, queue, exception)
+        job = find_or_initialize_job(worker, item, queue)
+        set_error(job, exception)
       end
 
-      def complete(worker, msg, queue, return_value)
-        job = find_job(msg)
-        return unless job
+      def complete(worker, item, queue, return_value)
+        job = find_or_initialize_job(worker, item, queue)
         job.update_attributes(
           finished_at: DateTime.now,
           status: 'complete',
@@ -65,12 +30,63 @@ module Sidekiq
 
       protected
 
-      def find_job(msg)
-        Sidekiq::Monitor::Job.find_by_jid(msg['jid'])
+      def find_or_initialize_job(worker, item, queue, options={})
+        defaults = {
+          set_name: true
+        }
+        options.reverse_merge!(defaults)
+
+        worker_class = nil
+        if worker.is_a?(String)
+          worker_class = worker.constantize
+        elsif worker.is_a?(Class)
+          worker_class = worker
+        else
+          worker_class = worker.class
+        end
+
+        job = Sidekiq::Monitor::Job.find_by_jid(item['jid'])
+        if job.blank?
+          attributes = {
+            jid: item['jid'],
+            queue: queue,
+            class_name: worker_class.name,
+            args: item['args'],
+            retry: item['retry'],
+            enqueued_at: DateTime.now,
+            status: 'queued'
+          }
+          if options[:set_name] == true
+            attributes[:name] = job_name(worker_class, item, queue)
+          end
+          job = Sidekiq::Monitor::Job.new(attributes)
+        end
+        job
+      end
+
+      def job_name(worker_class, item, queue)
+        args = item['args']
+        begin
+          worker_class.respond_to?(:job_name) ? worker_class.job_name(*args) : nil
+        rescue Exception => exception
+          # If the job doesn't exist yet, we'll need to create it
+          job = find_or_initialize_job(worker_class, item, queue, set_name: false)
+          set_error(job, exception)
+          raise exception
+        end
       end
 
-      def job_name(worker_class, args)
-        worker_class.respond_to?(:job_name) ? worker_class.job_name(*args) : nil
+      def set_error(job, exception)
+        result = job.result.present? ? job.result.symbolize_keys : {}
+        result.merge!({
+          message: "#{exception.class.name}: #{exception.message}",
+          backtrace: exception.backtrace
+        })
+        job.update_attributes(
+          finished_at: DateTime.now,
+          status: 'failed',
+          result: result
+        )
       end
     end
   end

data/lib/sidekiq/monitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Monitor
-    VERSION = '0.0.9'
+    VERSION = '0.1.1'
   end
 end

data/lib/sidekiq/monitor.rb

@@ -10,7 +10,9 @@ Dir.glob("#{directory}/../../app/datatables/sidekiq/monitor/jobs_datatable.rb")
 module Sidekiq
   module Monitor
     DEFAULTS = {
-      :graphs => nil
+      :graphs => nil,
+      :javascripts => [],
+      :poll_interval => 3000
     }
 
     def self.options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq