lex-health 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2f856755c6d39dace2d6f9f6bbc423beeb343eb67f740ff529f5331b5e83a5
-  data.tar.gz: c38df4676acaf03b95df03d825182588abfeda5d55dbe73c4b797daac96236db
+  metadata.gz: 7a2948d5ad7f73fe45466f8e2394730883aa6516a380560416aae0ded89b7d12
+  data.tar.gz: 0b12a07f49cd1f17e7b09e10ad5dece1e677572cf948c17b62b575084d93d5ab
 SHA512:
-  metadata.gz: 2e8377833cb61ba9cadaba696ffe53a78c901b589fd9d107e1d229d949add88b8829d44881e929a7210f5b4171f6bfe8d0091a093986e091f8422d9f09e2ccd2
-  data.tar.gz: cd7869647877e7ee40a03aa23ebd6a597d31bc7cfeb38c3c6582051f9288e506e6cf04fbc55d34f06269eb7442ac4853d728b1e43a7b45d4ef4e0e6bbf74ce48
+  metadata.gz: 65171ec77699e35c322cb8f372118bd92e908ceb86b61c8a6337cbd083a33973ad81aa5cbdeea86529b3bc63a3e664c90fd024b2b0dcf3b30b7acfedf2719b98
+  data.tar.gz: 7dd6b733d0f7101db17d11e23b15c0be51910505e10cb074c01d24a933098a012553d6e4f743bfe2d5268bea90e2c663ef5ee41fa92c9f1136bae619d610e72f

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    lex-health (0.1.2)
+    lex-health (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    codecov (0.2.8)
+    codecov (0.2.12)
       json
       simplecov
     diff-lcs (1.4.4)
     docile (1.3.2)
     json (2.3.1)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -33,28 +33,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.89.1)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-md (0.4.0)
-      rubocop (~> 0.60)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.43.1)
+    rubocop-ast (1.0.0)
+      parser (>= 2.7.1.5)
+    rubocop-rspec (1.44.1)
       rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.10.1)
     simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+    simplecov-html (0.12.3)
     unicode-display_width (1.7.0)
 
 PLATFORMS
@@ -67,8 +64,6 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-md
-  rubocop-performance
   rubocop-rspec
 
 BUNDLED WITH

data/bitbucket-pipelines.yml

@@ -0,0 +1,17 @@
+image: ruby:2.7.0
+
+pipelines:
+  tags:
+    "v*":
+      - step:
+          name: Push to RubyGems
+          deployment: RubyGems
+          script:
+            - gem install bundler gem-release rake rspec
+            - bundle install
+            - rake build
+            - mkdir .gem
+            - (umask  077 ; echo $gem_creds | base64 --decode > .gem/credentials)
+            - gem release
+          artifacts:
+            - pkg/**

data/{legion-extensions-health.gemspec → lex-health.gemspec}

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['matthewdiverson@gmail.com']
 
   spec.summary       = 'Legion::Extensions::Health'
-  spec.description   = 'Used to read heartbeats and update the db'
+  spec.description   = 'Used to read heartbeats and updates the db'
   spec.homepage      = 'https://bitbucket.org/legion-io/lex-health'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/lex-health'
   spec.metadata['changelog_uri'] = 'https://bitbucket.org/legion-io/lex-health/CHANGELOG.md'
+  spec.metadata['documentation_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/612171777/LEX+Health'
+  spec.metadata['changelog_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/612270081/'
+  spec.metadata['bug_tracker_uri'] = 'https://bitbucket.org/legion-io/lex-health/issues'
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -31,7 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-md'
-  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/legion/extensions/health.rb

@@ -1,10 +1,13 @@
 require 'legion/extensions/health/version'
-require 'legion/extensions'
 
 module Legion
   module Extensions
     module Health
-      extend Legion::Extensions::Core
+      extend Legion::Extensions::Core if Legion::Extensions.const_defined? :Core
+
+      def self.data_required?
+        true
+      end
     end
   end
 end

data/lib/legion/extensions/health/runners/health.rb

@@ -4,7 +4,7 @@ module Legion::Extensions::Health
       include Legion::Extensions::Helpers::Lex
 
       def update(hostname:, **opts)
-        item = Legion::Data::Model::Node.where(name: hostname).first
+        item = Legion::Data::Model::Node[name: hostname]
 
         return { success: insert(hostname: hostname, **opts), hostname: hostname, **opts } if item.nil?
 
@@ -16,7 +16,11 @@ module Legion::Extensions::Health
                    **opts }
         end
 
-        { success: item.update(active: 1, status: opts[:status], name: hostname), hostname: hostname, **opts }
+        {
+          success:  item.update(active: 1, status: opts[:status], name: hostname, updated: Sequel::CURRENT_TIMESTAMP),
+          hostname: hostname,
+          **opts
+        }
       end
 
       def insert(hostname:, status: 'unknown', **opts)

data/lib/legion/extensions/health/runners/watchdog.rb

@@ -5,11 +5,17 @@ module Legion::Extensions::Health
     module Watchdog
       include Legion::Extensions::Helpers::Lex
 
-      def expire(**_opts)
+      def expire(expire_time: 60, **_opts)
         nodes = []
         Legion::Data::Model::Node
           .where(status: 'healthy')
-          .where(Sequel.lit('updated <= DATE_SUB(SYSDATE(), INTERVAL 60 SECOND)'))
+          .where(
+            Sequel.lit(
+              "updated <= DATE_SUB(SYSDATE(), INTERVAL #{expire_time} SECOND)
+                  OR
+                  (updated is null and created <= DATE_SUB(SYSDATE(), INTERVAL #{expire_time} SECOND))"
+            )
+          )
           .where(active: true)
           .each do |node|
             Legion::Transport::Messages::NodeHealth.new(status:    'unknown',

data/lib/legion/extensions/health/transport/queues/health.rb

@@ -7,7 +7,13 @@ module Legion::Extensions::Health
         end
 
         def queue_options
-          { arguments: { 'x-single-active-consumer': true, 'x-dead-letter-exchange': 'node.dlx' }, auto_delete: false }
+          {
+            arguments:   {
+              'x-single-active-consumer': true,
+              'x-dead-letter-exchange':   'node.dlx'
+            },
+            auto_delete: false
+          }
         end
       end
     end

data/lib/legion/extensions/health/version.rb

@@ -1,7 +1,7 @@
 module Legion
   module Extensions
     module Health
-      VERSION = '0.1.2'.freeze
+      VERSION = '0.1.3'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lex-health
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Miverson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Used to read heartbeats and update the db
+description: Used to read heartbeats and updates the db
 email:
 - matthewdiverson@gmail.com
 executables: []
@@ -140,7 +112,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- legion-extensions-health.gemspec
+- bitbucket-pipelines.yml
+- lex-health.gemspec
 - lib/legion/extensions/health.rb
 - lib/legion/extensions/health/actors/health.rb
 - lib/legion/extensions/health/actors/watchdog.rb
@@ -156,7 +129,9 @@ licenses:
 metadata:
   homepage_uri: https://bitbucket.org/legion-io/lex-health
   source_code_uri: https://bitbucket.org/legion-io/lex-health
-  changelog_uri: https://bitbucket.org/legion-io/lex-health/CHANGELOG.md
+  changelog_uri: https://legionio.atlassian.net/wiki/spaces/LEX/pages/612270081/
+  documentation_uri: https://legionio.atlassian.net/wiki/spaces/LEX/pages/612171777/LEX+Health
+  bug_tracker_uri: https://bitbucket.org/legion-io/lex-health/issues
 post_install_message:
 rdoc_options: []
 require_paths: