okcomputer 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2e2e1fbf0bd12e43eeed9987395392fefc5820
-  data.tar.gz: 071f6f634691d45b44c5f134c2d3b87534834199
+  metadata.gz: 7feee2279b4b7c981316b0e8bfaf955c0d0ac503
+  data.tar.gz: 07ca4c4d3e41c368662e4bc102cd2a7091edc06a
 SHA512:
-  metadata.gz: 36ef20a1ceae3441cb1ed24f5b78d1596b51724aad107a62f5b5850901b0138a1fa3e686307469749247e91ac129a0c8c574f3d152c6f5633d9aea34a66be658
-  data.tar.gz: 8f6dd78954876861034bd82052159cd7b759bfa4a7b7e25845a4d90ea86908e57c78e579bb9928510f44b3dc2b1b25e7af206045cba2050dd8351ac15f794271
+  metadata.gz: 39b9456a1387de6c248c7071f8bfc1f7d345f59f83201c847d0a453605dc3e37472af1ec5371bc69f699e7350bed3d1621d32a022af37196b9303b1275defed0
+  data.tar.gz: c48b7ae52c764917e7122dcb71a3df1cb6b872b0683aa3d695e2c62593f0b4b4825c08ad1f44c103cc7fc2350b0caae0411faede1e00dc6858c33bdaebafcfd8

data/lib/ok_computer/built_in_checks/delayed_job_backed_up_check.rb

@@ -1,14 +1,21 @@
 module OkComputer
   class DelayedJobBackedUpCheck < SizeThresholdCheck
-    attr_accessor :priority
-    attr_accessor :threshold
-    attr_accessor :greater_than_priority
+    attr_accessor :priority,
+                  :threshold,
+                  :queue,
+                  :include_locked,
+                  :include_errored,
+                  :greater_than_priority
 
     # Public: Initialize a check for backed-up Delayed Job jobs
     #
     # priority - Which priority to check for
-    # threshold - An Integer to compare the jobs count against
-    #   to consider it backed up
+    # threshold - An Integer to compare the jobs count against to consider it backed up
+    # options - Hash of optional parameters
+    #    queue - Used to monitor a specific delayed job queue (default: nil)
+    #    include_locked - If true, will include currently locked jobs in the query (default: false)
+    #    include_errored - If true, will include currently errored jobs in the query (default: false)
+    #    greater_than_priority - If true, will include all jobs with a priority value equal or greater than the set value.
     #
     # Example:
     #   check = new(10, 50)
@@ -18,6 +25,9 @@ module OkComputer
     def initialize(priority, threshold, options = {})
       self.priority = Integer(priority)
       self.threshold = Integer(threshold)
+      self.queue = options[:queue]
+      self.include_locked = !!options[:include_locked]
+      self.include_errored = !!options[:include_errored]
       self.greater_than_priority = !!options[:greater_than_priority]
       self.name = greater_than_priority ? "Delayed Jobs with priority higher than '#{priority}'" : "Delayed Jobs with priority lower than '#{priority}'"
     end
@@ -30,7 +40,11 @@ module OkComputer
         operator = greater_than_priority ? ">=" : "<="
         query = Delayed::Job.where("priority #{operator} ?", priority)
       end
-      query.where(:locked_at => nil, :last_error => nil).count
+      opts = {}
+      opts[:queue] = queue if queue
+      opts[:locked_at] = nil unless include_locked
+      opts[:last_error] = nil unless include_errored
+      query.where(opts).count
     end
   end
 end

data/lib/ok_computer/built_in_checks/mongoid_check.rb

@@ -7,7 +7,9 @@ module OkComputer
     # session - The name of the Mongoid session to use. Defaults to the
     #   default session.
     def initialize(session = :default)
-      if Mongoid.respond_to?(:sessions)
+      if Mongoid.respond_to?(:clients) # Mongoid 5
+        self.session = Mongoid::Clients.with_name(session)
+      elsif Mongoid.respond_to?(:sessions) # Mongoid 4
         self.session = Mongoid::Sessions.with_name(session)
       end
     end

data/lib/ok_computer/version.rb

@@ -1,3 +1,3 @@
 module OkComputer
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okcomputer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3