heartcheck-sidekiq 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f636ae04d8879d0d2d718c0f7639cc38065f9a1
-  data.tar.gz: 15ae7e7b6023e4fb6a2916979aed16c3618fa6cb
+SHA256:
+  metadata.gz: ee2cfe85ad4728a880b2c239d5e0f8fffb5d005379c8775ab64a99d2df0689bd
+  data.tar.gz: 708d22cb7caf4f473c4fab70c1b89481a3de4dd2103af08d8cd95bdc868e7162
 SHA512:
-  metadata.gz: 9f67a90bb11e018e20b782b00d4de4cd9e312c7b576bd1f6f824cef3fcb4fcd8b904f8603e5dc190cf7fc501d9fa02990776db8015876a9e71037bdb649ba6bd
-  data.tar.gz: edf02fdad9ff9f58390bd10cd9fd3c31dd2db37cf57df02f49cb05e70e489868d92a3afd1776a47cb7f0a771489befb6cc30ffbb92b59827c60afb35cb1d7e46
+  metadata.gz: f7eab93ee443a738a37b1d413da6a461c49bcaed18b2ee58c19b7da5d8416792ab275b85e16b4fd4b4adf7bc708557de44ecdd40dc9d704660e1e3f20ca4779f
+  data.tar.gz: 83f61f50be09e2acccb94767015bfcfedf42cd9c8be25955e78136389ad74cd73e536dfe21b2b932531cbddc8e32427a8f95d0489c9bc6299fba74ba2ff3a4f1

data/lib/heartcheck/checks/sidekiq.rb

@@ -1,3 +1,5 @@
+require 'heartcheck/monitoring/redis'
+
 module Heartcheck
   module Checks
     # Check for a sidekiq service
@@ -8,45 +10,13 @@ module Heartcheck
       # @retun [void]
       def validate
         ::Sidekiq.redis do |connection|
-          append_error(:set) unless set?(connection)
-          append_error(:get) unless get?(connection)
-          append_error(:delete) unless del?(connection)
+          errors = Monitoring::Redis.run_checks(connection)
+          errors.each { |error| append_error(error) }
         end
-      rescue ::Redis::BaseError
-        append_error('connect to redis')
-      rescue => e
-        @errors << "Sidekiq error: #{e.message}"
       end
 
       private
 
-      # test if can write on redis
-      #
-      # @param con [Redis] an instance of redis
-      #
-      # @return [Bollean]
-      def set?(con)
-        con.set('check_test', 'heartcheck') == 'OK'
-      end
-
-      # test if can read on redis
-      #
-      # @param con [Redis] an instance of redis
-      #
-      # @return [Bollean]
-      def get?(con)
-        con.get('check_test') == 'heartcheck'
-      end
-
-      # test if can delete on redis
-      #
-      # @param con [Redis] an instance of redis
-      #
-      # @return [Bollean]
-      def del?(con)
-        con.del('check_test') == 1
-      end
-
       # customize the error message
       # It's called in Heartcheck::Checks::Base#append_error
       #
@@ -54,7 +24,7 @@ module Heartcheck
       #
       # @return [void]
       def custom_error(key_error)
-        @errors << "Sidekiq fails to #{key_error}"
+        @errors << key_error
       end
     end
   end

data/lib/heartcheck/monitoring/redis.rb

@@ -0,0 +1,47 @@
+module Heartcheck
+  module Monitoring
+    # Handles redis monitoring, such as TCP lookup and basic operations
+    class Redis
+      # Runs all checks on a given redis connection
+      #
+      # @param redis_conn [Redis] the redis connection
+      # @return errors [Array] an array with error messages
+      def self.run_checks(redis_conn)
+        new(redis_conn).run_checks
+      end
+
+      def initialize(redis_conn)
+        @redis_conn = redis_conn
+        @errors = []
+      end
+
+      def run_checks
+        begin
+          @errors << 'Sidekiq fails to set' unless can_store?
+          @errors << 'Sidekiq fails to get' unless can_fetch?
+          @errors << 'Sidekiq fails to delete' unless can_delete?
+        rescue ::Redis::BaseError
+          @errors << 'Sidekiq fails to connect to redis'
+        rescue => e
+          @errors << "Sidekiq error: #{e.message}"
+        end
+
+        @errors
+      end
+
+      private
+
+      def can_store?
+        @redis_conn.set('check_test', 'heartcheck') == 'OK'
+      end
+
+      def can_fetch?
+        @redis_conn.get('check_test') == 'heartcheck'
+      end
+
+      def can_delete?
+        @redis_conn.del('check_test') == 1
+      end
+    end
+  end
+end

data/lib/heartcheck/sidekiq/version.rb

@@ -2,6 +2,6 @@
 module Heartcheck
   # gem version
   module Sidekiq
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: heartcheck-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Locaweb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heartcheck
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -68,20 +74,20 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -140,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/heartcheck/checks/sidekiq.rb
+- lib/heartcheck/monitoring/redis.rb
 - lib/heartcheck/sidekiq.rb
 - lib/heartcheck/sidekiq/version.rb
 homepage: http://developer.locaweb.com.br
@@ -161,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A sidekiq checker