healthchecker 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc7f6e889adb52b145323143f46f2f0b7cbaec5
-  data.tar.gz: e038ebc0a304754cfe75b1abbfa4fe848782e8a9
+  metadata.gz: 2b2c42adf9ab5a9dd7f02441d11b3e4a24c14555
+  data.tar.gz: 1b1f902feb8f5f38e29504746eab2f510420ca3c
 SHA512:
-  metadata.gz: 1ce3ae762d7e41f1b01c68c16a148b82783733b2956a8003260715d7b00781e11a2706f8e57a09979cb86b016f1ca4086e8d4fe07b07c34d9b1cd02e52283fa4
-  data.tar.gz: bf9f479fa4edf7399cf0310a6906a82a3a0fb8f63884c04e30213701c54b6f9dd58b939306b14ef38ed41dd1989dc23736e092dd64182958dae4c9bb37f93c1b
+  metadata.gz: 45eb13eb6df288f250858b7d1108efc5de42598a4e4170e75ba7b343cc9a1f08d124f8424bcb43116e65d0812e02d3afb8f3162d8105c59afbb83107c2c71e10
+  data.tar.gz: 3d9a9d5fdec0ce8060862d897a9d61a81c08e584cef6d09a219f48205c78624d8a2bad96884fdd41701982ab7ab6cb4c2e31e6ae6c43ea6e9858c0fd7593dcfd

data/app/controllers/healthchecker/metrics_controller.rb

@@ -6,19 +6,53 @@ module Healthchecker
     end
 
     def current_status
+      Healthchecker.configuration.metrics.reduce(uptime) { |status, metric|
+        if ConfigurableMetrics.method_defined? metric
+          status = status.merge(ConfigurableMetrics.send metric)
+        else
+          supported_metrics = ConfigurableMetrics.public_instance_methods
+          message = "#{metric} is not a supported metric. Supported metrics are #{supported_metrics}"
+          raise Healthchecker::ConfigurationError, message
+        end
+        status
+      }
+    end
+
+    def uptime
       {
-        redis: {
-          ok: (Redis.current.ping == 'PONG'),
-          config: Redis.current.client.options,
-        },
-        resque_redis:  {
-          ok: (Resque.redis.ping == 'PONG'),
-          config: Resque.redis.client.options,
-        },
-        uptime: (Time.now - Healthchecker::APPLICATION_STARTED_AT),
+        uptime: Time.now - Healthchecker::APPLICATION_STARTED_AT
       }
     end
 
+    module ConfigurableMetrics
+      def redis
+        {
+          redis: {
+            ok: Redis.current.ping == 'PONG',
+            config: Redis.current.client.options
+          }
+        }
+      end
 
+      def resque
+        {
+          resque_redis:  {
+            ok: Resque.redis.ping == 'PONG',
+            config: Resque.redis.client.options
+          }
+        }
+      end
+
+      def sidekiq
+        redis = Sidekiq.redis { |conn| conn }
+
+        {
+          sidekiq_redis: {
+            ok: redis.ping == 'PONG',
+            config: redis.client.options
+          }
+        }
+      end
+    end
   end
 end

data/lib/healthchecker/checks/solr.rb

@@ -5,7 +5,7 @@ module Healthchecker::Checks
 
     def client
       if options[:rsolr_client]
-        options[:rsolr_client] 
+        options[:rsolr_client]
       elsif options[:url]
         RSolr.connect(url: options[:url])
       else
@@ -14,8 +14,11 @@ module Healthchecker::Checks
     end
 
     def check!
+      msg = "Could not connect to solr"
       ping_success = client.head("admin/ping", :headers => {"Cache-Control" => "If-None-Match"}).response[:status] == 200
-      raise "Could not connect to solr" unless ping_success
+      raise msg unless ping_success
+    rescue => e
+      raise msg
     end
   end
 end

data/lib/healthchecker/configuration.rb

@@ -0,0 +1,11 @@
+module Healthchecker
+  class ConfigurationError < StandardError; end
+
+  class Configuration
+    attr_accessor :metrics
+
+    def initialize
+      @metrics = [:redis, :resque]
+    end
+  end
+end

data/lib/healthchecker/version.rb

@@ -1,3 +1,3 @@
 module Healthchecker
-  VERSION = "1.1.2"
+  VERSION = "1.1.4"
 end

data/lib/healthchecker.rb

@@ -1,4 +1,5 @@
-require "healthchecker/engine"
+require 'healthchecker/engine'
+require 'healthchecker/configuration'
 require 'healthchecker/check'
 require 'healthchecker/checks/redis'
 require 'healthchecker/checks/migration'
@@ -12,6 +13,11 @@ module Healthchecker
   APPLICATION_STARTED_AT = Time.now
 
   mattr_accessor :checks
+
+  class << self
+    attr_writer :configuration
+  end
+
   self.checks = []
 
   def self.add_check(name_or_class, options={})
@@ -22,6 +28,20 @@ module Healthchecker
     self.checks.map(&:perform_check).compact
   end
 
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  private
+
   def self.lookup_class(name_or_class)
     return name_or_class if name_or_class.respond_to?(:new)
     "Healthchecker::Checks::#{name_or_class.to_s.capitalize}".constantize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: healthchecker
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,6 +120,7 @@ files:
 - lib/healthchecker/checks/redis.rb
 - lib/healthchecker/checks/s3.rb
 - lib/healthchecker/checks/solr.rb
+- lib/healthchecker/configuration.rb
 - lib/healthchecker/engine.rb
 - lib/healthchecker/version.rb
 - lib/tasks/healthchecker_tasks.rake
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Standardized, healthcheck end-point for rails apps