health-monitor-rails 7.3.1 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c698297ece6c817cca14cdf047d7576933d68f2
-  data.tar.gz: 024b1a433db3fe3ac5b6a7a54cc316a2f5870fe3
+  metadata.gz: 85424832894f22b0c7ea378d9f196b5391b75309
+  data.tar.gz: 4a94ec537d24ec741d9aff84123541abd8a9995a
 SHA512:
-  metadata.gz: 72366f5c346f6fabb6bde9f89cc5b6ce8dec8d55bed144b2dc405bb27ad1d1d820d8712e1e6ebc2b85c0fb0b2e01ec3ee7eb38b891280c7d23f0c6ff1e1dcd63
-  data.tar.gz: d8e9aade1d886309b1a9d5a57c45d756144fe6cd626894ee98784a982dcddce7edebdb783a564ab354a9f4f004988f60ff3bba4929cdff115eae717a1a4d8a1b
+  metadata.gz: 42aae7d82352be072f1aaa67465cb83bb2643fc372b79d3ebb7699aefe9638b191c9becf834c0e0f138f8a0d64a281e3edb410d8d8dc56aad972a4e9b772a866
+  data.tar.gz: 8895295d39d649d1c53a7a1256d72d7fe4f797ca25d3e323a2b6819cc5c68138b93d381323c2ddbb1000554198fa25b7e681ec86452d4bfaf9b41342517eb065

data/README.md

@@ -148,17 +148,21 @@ end
 Some of the providers can also accept additional configuration:
 
 ```ruby
+# Sidekiq
 HealthMonitor.configure do |config|
   config.sidekiq.configure do |sidekiq_config|
     sidekiq_config.latency = 3.hours
+    sidekiq_config.queue_size = 50
   end
 end
 ```
 
 ```ruby
+# Redis
 HealthMonitor.configure do |config|
   config.redis.configure do |redis_config|
-    redis_config.url = 'redis://user:pass@example.redis.com:90210/'
+    redis_config.connection = Redis.current # use your custom redis connection
+    redis_config.url = 'redis://user:pass@example.redis.com:90210/' # or URL
   end
 end
 ```
@@ -168,11 +172,12 @@ The currently supported settings are:
 #### Sidekiq
 
 * `latency`: the latency (in seconds) of a queue (now - when the oldest job was enqueued) which is considered unhealthy (the default is 30 seconds, but larger processing queue should have a larger latency value).
+* `queue_size`: the size (maximim) of a queue which is considered unhealthy (the default is 100).
 
 #### Redis
 
 * `url`: the url used to connect to your Redis instance - note, this is an optional configuration and will use the default connection if not specified
-
+* `connection`: Use custom redis connection (e.g., `Redis.current`).
 
 ### Adding a Custom Provider
 It's also possible to add custom health check providers suited for your needs (of course, it's highly appreciated and encouraged if you'd contribute useful providers to the project).

data/lib/health_monitor/providers/redis.rb

@@ -8,7 +8,7 @@ module HealthMonitor
       class Configuration
         DEFAULT_URL = nil
 
-        attr_accessor :url
+        attr_accessor :url, :connection
 
         def initialize
           @url = DEFAULT_URL
@@ -26,7 +26,6 @@ module HealthMonitor
       def check!
         time = Time.now.to_s(:rfc2822)
 
-        redis = configuration.url ? ::Redis.new(url: configuration.url) : ::Redis.new
         redis.set(key, time)
         fetched = redis.get(key)
 
@@ -42,6 +41,17 @@ module HealthMonitor
       def key
         @key ||= ['health', request.try(:remote_ip)].join(':')
       end
+
+      def redis
+        @redis =
+          if configuration.connection
+            configuration.connection
+          elsif configuration.url
+            ::Redis.new(url: configuration.url)
+          else
+            ::Redis.new
+          end
+      end
     end
   end
 end

data/lib/health_monitor/providers/sidekiq.rb

@@ -8,11 +8,13 @@ module HealthMonitor
     class Sidekiq < Base
       class Configuration
         DEFAULT_LATENCY_TIMEOUT = 30
+        DEFAULT_QUEUES_SIZE = 100
 
-        attr_accessor :latency
+        attr_accessor :latency, :queue_size
 
         def initialize
           @latency = DEFAULT_LATENCY_TIMEOUT
+          @queue_size = DEFAULT_QUEUES_SIZE
         end
       end
 
@@ -20,6 +22,7 @@ module HealthMonitor
         check_workers!
         check_processes!
         check_latency!
+        check_queue_size!
         check_redis!
       rescue Exception => e
         raise SidekiqException.new(e.message)
@@ -47,13 +50,21 @@ module HealthMonitor
       end
 
       def check_latency!
-        latency = ::Sidekiq::Queue.new.latency
+        latency = queue.latency
 
         return unless latency > configuration.latency
 
         raise "latency #{latency} is greater than #{configuration.latency}"
       end
 
+      def check_queue_size!
+        size = queue.size
+
+        return unless size > configuration.queue_size
+
+        raise "queue size #{size} is greater than #{configuration.queue_size}"
+      end
+
       def check_redis!
         if ::Sidekiq.respond_to?(:redis_info)
           ::Sidekiq.redis_info
@@ -61,6 +72,10 @@ module HealthMonitor
           ::Sidekiq.redis(&:info)
         end
       end
+
+      private def queue
+        @queue ||= ::Sidekiq::Queue.new
+      end
     end
   end
 end

data/lib/health_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HealthMonitor
-  VERSION = '7.3.1'.freeze
+  VERSION = '7.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-monitor-rails
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.4.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement