hcheck 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d9d1373ccfab7fe053f2413da9474f371b5cd9
-  data.tar.gz: ece2db1ed128d3356a931cc635129f6369872645
+  metadata.gz: 4e3d277ec5fd7cb5d49761ed2437b79cbe60c3c2
+  data.tar.gz: bfcc780533bdef656e295a4211331f823ee77339
 SHA512:
-  metadata.gz: 35332044c5f470d706ed3ec67fc080a316fdc707f52c4852b47e80bf720dd95b3a28d45b8c34e8d57f066134e5476056d6006ab275f51f95b37d7dfd8169953b
-  data.tar.gz: 83aee556a3c44eb030fcb7df957f758b9c4bfa5febff4f2a60a7dc6c01da5584ddd004d9481d6af7937af479e4d83b2ad436627ee4fd2aaf719dba7869d73e78
+  metadata.gz: f58c28e881cb5de5c7520a846e911fcbf2d721fd77913bb38923725c94be5ae922156cef76a16bf05ee175f104f41919f2f9197ae3c731eea3fe12d1c23a7223
+  data.tar.gz: b0fd9d9d065454d8723a5fc82f6f78cb4a6bbb5c047bebee69c7fc917e36e26f474913f8689d627e0813e27fd502746fcbfa84c394553009f1d0f5b6b3f1fbd3

data/.travis.yml

@@ -1,5 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.2
-before_install: gem install bundler -v 1.16.1
+  - 2.4.4
+  - 2.5.1
+cache: bundler
+branches:
+  only:
+  - master
+script:
+  - bundle exec rake
+  - bundle exec rubocop --parallel

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hcheck (0.1.0)
+    hcheck (0.1.1)
       haml (~> 5.0)
       sinatra (~> 2.0)
 

data/README.md

@@ -1,4 +1,5 @@
 # Hcheck
+[![Build Status](https://travis-ci.com/cloudfactory/hcheck.svg?branch=master)](https://travis-ci.com/cloudfactory/hcheck)
 
 Configuration driven health checker for ruby apps. Can be mounted or booted as standalone app.
 
@@ -112,8 +113,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Todo
 
 Travis CI Integrations
-  - Github PR status
-  - Continuous Integration
+  - ~~Github PR status~~
+  - ~~Continuous Integration~~
   - Continuous release to RubyGems
 
 ## Contributing

data/hcheck.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
       'public gem pushes.'

data/lib/hcheck/checks/memcached.rb

@@ -8,10 +8,6 @@ module Hcheck
       def status(config)
         client = Dalli::Client.new(config.delete(:url), config)
         client.get('_')
-        'ok'
-      rescue Dalli::RingError => e
-        Hcheck.logger.error "[HCheck] Memcached::Error::NoServerAvailable #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/checks/mongodb.rb

@@ -11,10 +11,6 @@ module Hcheck
         client = Mongo::Client.new(hosts, mongo_config.merge(server_selection_timeout: hosts.count * 2))
         client.database_names
         client.close
-        'ok'
-      rescue Mongo::Error::NoServerAvailable => e
-        Hcheck.logger.error "[HCheck] Mongo::Error::NoServerAvailable #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/checks/mysql.rb

@@ -8,10 +8,6 @@ module Hcheck
       def status(config)
         connection = Mysql2::Client.new(config)
         connection.close
-        'ok'
-      rescue Mysql2::Error => e
-        Hcheck.logger.error "[HCheck] Mysql2::Error::ConnectionError #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/checks/ping.rb

@@ -10,15 +10,11 @@ module Hcheck
         url = URI.parse(config[:url])
         request = build_request(url)
 
-        case request.request_head(url.path)
-        when Net::HTTPSuccess, Net::HTTPRedirection, Net::HTTPInformation
-          'ok'
-        else
-          'bad'
-        end
-      rescue Net::ReadTimeout, Errno::ECONNREFUSED => e
-        Hcheck.logger.error "[HCheck] Ping Fail #{e.message}"
-        'bad'
+        res = request.request_head(url.path)
+
+        ok_responses = [Net::HTTPSuccess, Net::HTTPInformation, Net::HTTPMovedPermanently]
+
+        fail_with(res, url) unless ok_responses.include?(res.class)
       end
 
       def self.included(_base)
@@ -33,6 +29,11 @@ module Hcheck
         url.path = '/' if url.path.empty?
         req
       end
+
+      def fail_with(response, url)
+        raise Hcheck::Errors::HTTPError,
+              [response.class, response.code, response.message].join(' ') + " from #{url}"
+      end
     end
   end
 end

data/lib/hcheck/checks/postgresql.rb

@@ -10,10 +10,6 @@ module Hcheck
         config[:dbname] = config.delete(:database) if config[:database]
 
         PG::Connection.new(config).close
-        'ok'
-      rescue PG::ConnectionBad => e
-        Hcheck.logger.error "[HCheck] PG::ConnectionBad #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/checks/rabbitmq.rb

@@ -9,16 +9,6 @@ module Hcheck
         connection = Bunny.new(config)
         connection.start
         connection.close
-        'ok'
-      rescue Bunny::TCPConnectionFailed,
-             Bunny::TCPConnectionFailedForAllHosts,
-             Bunny::NetworkFailure,
-             Bunny::AuthenticationFailureError,
-             Bunny::PossibleAuthenticationFailureError,
-             AMQ::Protocol::EmptyResponseError => e
-
-        Hcheck.logger.error "[HCheck] Bunny::Error #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/checks/redis.rb

@@ -9,10 +9,6 @@ module Hcheck
         config[:sentinels] = config[:sentinels].map(&:symbolize_keys) if config[:sentinels]
 
         ::Redis.new(config).ping
-        'ok'
-      rescue ::Redis::CannotConnectError => e
-        Hcheck.logger.error "[HCheck] Redis server unavailable #{e.message}"
-        'bad'
       end
 
       def self.included(_base)

data/lib/hcheck/configuration/service.rb

@@ -30,12 +30,20 @@ module Hcheck
         {
           name: @name,
           desc: @check,
-          status: @check_not_available ? NOT_IMPLEMENTED_MSG : status(@options)
+          status: @check_not_available ? NOT_IMPLEMENTED_MSG : check_status
         }
       end
 
       private
 
+      def check_status
+        status(@options)
+        'ok'
+      rescue StandardError => e
+        Hcheck.logger.error "[HCheck] #{e.class.name} #{e.message}"
+        'bad'
+      end
+
       def load_mod
         Hcheck::Checks.const_get(@name.capitalize)
       rescue NameError

data/lib/hcheck/errors.rb

@@ -13,14 +13,17 @@ module Hcheck
       end
     end
 
+    # Invalid auth token, when hcheck secure enabled
     class InvalidAuthentication < HcheckError
       MSG = 'Invalid authenticity token!'
     end
 
+    # Incomplete auth setup, auth token not setup, when hcheck secure enabled
     class IncompleteAuthSetup < HcheckError
       MSG = 'Incomplete auth setup in HCheck server'
     end
 
+    # Configuration related error
     class ConfigurationError < HcheckError
       MSG = 'Hcheck configuration cannot not be found or read'
 
@@ -28,5 +31,12 @@ module Hcheck
         super("#{MSG}\n#{err.class}\n#{err.message}")
       end
     end
+
+    # HTTP related error
+    class HTTPError < HcheckError
+      def initialize(msg)
+        super("Couldn't get a successful response code. #{msg}")
+      end
+    end
   end
 end

data/lib/hcheck/helper.rb

@@ -25,7 +25,7 @@ end
 # Imported from rails/active_support
 class Object
   def blank?
-    respond_to?(:empty?) ? !!empty? : !self
+    respond_to?(:empty?) ? empty? : !self
   end
 
   def present?

data/lib/hcheck/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hcheck
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcheck
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rohit Joshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml