cepa-health 0.2.0 → 0.2.1

data/lib/cepa-health.rb

@@ -8,10 +8,9 @@ module CepaHealth
   class Result
     attr_reader :records
 
-    def execute(name, block)
-      v = !!instance_exec(&block)
-      @success = @success && v
-      record(name, v, v ? "Success" : "Failed")
+    def execute(block)
+      v = instance_exec(&block)
+      Array === v ? record(*v) : record("Probe", v, v ? "Success" : "Failed")
     end
 
     def initialize
@@ -21,7 +20,7 @@ module CepaHealth
 
     def record(name, status, comment)
       @success = @success && !!status
-      @records << [name, status, comment]
+      @records << [name.to_s, !!status, comment.to_s]
     end
 
     def success?
@@ -45,7 +44,7 @@ module CepaHealth
       result = CepaHealth::Result.new
       filters = filters.map { |v| v.to_s }
       selected = filters.empty? ? probes : probes.select { |k,v| filters.include?(k) } 
-      selected.values.flatten(1).each { |v| result.execute(*v) }
+      selected.values.flatten(1).each { |v| result.execute(v) }
       result
     end
 
@@ -63,9 +62,9 @@ module CepaHealth
 
     # Registers the given block as a probe. An optional level can be supplied,
     # which can be used as a filter.
-    def register(name, level = :error, &block)
+    def register(level = :error, &block)
       list = probes[level.to_s] ||= []
-      list << [name, block]
+      list << block
       self
     end
 

data/lib/cepa-health/version.rb

@@ -1,4 +1,4 @@
 module CepaHealth
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 

data/probes/delayed_job.rb

@@ -3,21 +3,20 @@
 
 if defined?(Delayed)
 
-  CepaHealth.register "Delayed Job", "warn" do
+  CepaHealth.register :warn do
     now = Time.now.utc
     record "Delayed Job Backlog", true, Delayed::Job.count
 
     # Detect if the DJ backend is ActiveRecord or Mongoid Based
-    query = case 
-    when Delayed::Job.respond_to?(:order_by) then Delayed::Job.order_by(:run_at.desc)
-    when Delayed::Job.respond_to?(:order) then Delayed::Job.order("run_at DESC")
+    type = case 
+    when Delayed::Job.respond_to?(:order_by) then :mongoid
+    when Delayed::Job.respond_to?(:order) then :active_record
     else nil
     end
 
-    if query.nil?
-      record "Unknown Delayed Job Backend", false, "#{Delayed::Job}"
-    else
-      # Maximum Delayed Job age is 10 minutes
+    # Maximum Delayed Job age is 10 minutes
+    unless type.nil?
+      query = type == :active_record ? Delayed::Job.order("run_at DESC") : Delayed::Job.order_by(:run_at.desc)
       value = query.last
       if value.nil? || value.run_at > now
         record 'Delayed Job Backlog Age', true, 'No expired jobs'
@@ -27,7 +26,13 @@ if defined?(Delayed)
       end
     end
 
-    true
-  end  
+    # Check for failed jobs
+    if type.nil?
+      [ "Unknown Delayed Job Backend", false, "#{Delayed::Job}" ]
+    else
+      failures = type == :active_record ? Delayed::Job.where('attempts > 0').count : Delayed::Job.where(:attempts.gt => 0).count
+      ["Delayed Job Failures", failures == 0, "#{failures} failed job#{failures == 1 ? '' : 's'}"]
+    end
+  end
 
 end

data/probes/mongoid.rb

@@ -3,7 +3,7 @@
 
 if defined?(Mongoid)
 
-  CepaHealth.register "Mongoid" do
+  CepaHealth.register do
     value = { 'ok' => nil }
     tries = 3
     begin
@@ -13,7 +13,8 @@ if defined?(Mongoid)
       tries -= 1
       retry unless tries <= 0
     end
-    value['ok'] == 1.0
+    
+    [ "Mongoid", value['ok'] == 1.0, "Ping Database"]
   end  
 
 end

data/probes/rails.rb

@@ -4,9 +4,8 @@
 if defined?(Rails)
 
   # A Trivial Rails probe.
-  CepaHealth.register "Rails" do
-    record "Rails Major Version", true, Rails.version.split('.').first
-    true
+  CepaHealth.register do
+    ["Rails Major Version", true, Rails.version.split('.').first]
   end
 
 end

data/probes/sqlite.rb

@@ -6,10 +6,9 @@ if defined?(ActiveRecord) && defined?(SQLite3)
   CepaHealth.register "SQLite" do
     begin
       ActiveRecord::Base.connection.exec_query("PRAGMA quick_check")
-      true
+      [ "SQLite", true, "Quick Check" ]
     rescue Exception => e
-      record("SQLite Failure", false, e.inspect)
-      false
+      [ "SQLite", false, e.inspect ]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cepa-health
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: