process_balancer 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2b7936e66ec20f0b2cf36e107dd9a2aae52bdd19e03617f44d6e36abd5c008
-  data.tar.gz: 5c7b264651a91513a59545e2fdcbbfca0bd13d079c4787e8fce3c90370e3d59c
+  metadata.gz: 869b9d54b977304ac3c13b5057a118ae19b776dc37b7d72e74435efc320a8553
+  data.tar.gz: 0e4a88eb0abdf6082043230b66c67483302d243299113c2605f0e33348d4f985
 SHA512:
-  metadata.gz: 1c846bde2ec1126116b529471e338e3caec0bd87695f38e6fd61bbfca5e9bdf29c888dbb55b99a7b849dc3584c1807d95ddd198f05eec6fb0ba837d24c5a313d
-  data.tar.gz: 3aab7f4a78e10282065c1dfba9c7d39ea74e489d52de600c85f42e6608aab07864380aa36df49a8f13c2b3e4929230d010ed782561614648f98f81696ebd72d1
+  metadata.gz: b7d63f8c3666194555442c36c1c0c1dbdee211e59b664791450c46fd7981cab515cd2db949c20c4280af5f38e728c44153339f493d4535ea93e56528d57fefe3
+  data.tar.gz: a269ac7431b7a038bfb20f029e0fdd79a1817d66b2130aca405455a0a271a08ee1275f28c3f0ff456942cc61b5deaa2aa67d63bcee874e6311faa42b30edac6a

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Next]
+### Added
+### Changed
+### Fixed
+
+## [1.1.1]
+### Fixed
+- handle better redis gem before 4.2 and post 4.2
+
+## [1.1.0]
+### Changed
+- handle pruning stale workers from the process list
+- updated rubocop
+### Fixed
+- fixed duplicating defaults
+
+## [1.0.0]
+### Added
+- initial process balancer release

data/lib/process_balancer.rb

@@ -15,8 +15,8 @@ module ProcessBalancer # :nodoc:
   WORKER_COUNT_KEY = 'worker_counts'
 
   DEFAULTS = {
-      redis:            {},
-      job_sets:         [],
+      redis:            {}.freeze,
+      job_sets:         [].freeze,
       require:          '.',
       max_threads:      10,
       shutdown_timeout: 30,
@@ -24,7 +24,12 @@ module ProcessBalancer # :nodoc:
   }.freeze
 
   def self.options
-    @options ||= DEFAULTS.dup
+    @options ||= begin
+      o = DEFAULTS.dup
+      o[:redis] = o[:redis].dup
+      o[:job_sets] = o[:job_sets].dup
+      o
+    end
   end
 
   def self.options=(opts)
@@ -49,7 +54,7 @@ module ProcessBalancer # :nodoc:
   end
 
   def self.logger
-    @logger ||= Logger.new(STDOUT, level: Logger::INFO)
+    @logger ||= Logger.new($stdout, level: Logger::INFO)
   end
 
   def self.redis
@@ -124,7 +129,7 @@ module ProcessBalancer # :nodoc:
         data = c.hget("#{worker}:workers", job_id)
         if data
           data = JSON.parse(data, symbolize_names: true)
-          count += (data.dig(:running)&.size || 0)
+          count += (data[:running]&.size || 0)
         end
       rescue JSON::ParserError
         nil

data/lib/process_balancer/cli.rb

@@ -151,7 +151,7 @@ module ProcessBalancer
 
       opts = {}
       # pull in global config
-      opts.merge!(config.dig(:global) || {})
+      opts.merge!(config[:global] || {})
       # pull in ENV override config
       opts.merge!(config.dig(:environments, environment.to_sym) || {})
 
@@ -212,7 +212,7 @@ module ProcessBalancer
           # Heroku sends TERM and then waits 30 seconds for process to exit.
           raise Interrupt
         },
-        USR1: lambda { |cli|
+        USR1: lambda { |cli| # rubocop: disable Naming/VariableNumber
           ProcessBalancer.logger.info 'Received USR1, no longer accepting new work'
           cli.manager.quiet
         },

data/lib/process_balancer/manager.rb

@@ -121,7 +121,18 @@ module ProcessBalancer
       redis do |c|
         c.watch(PROCESSES_KEY)
 
-        workers     = c.lrange(PROCESSES_KEY, 0, -1)
+        workers   = c.lrange(PROCESSES_KEY, 0, -1)
+        stale_ids = workers.reject { |i| [true, 1].include?(c.exists(i)) }
+        unless stale_ids.empty?
+          c.multi do
+            stale_ids.each do |id|
+              c.lrem(PROCESSES_KEY, 0, id)
+            end
+          end
+          # re-fetch
+          c.watch(PROCESSES_KEY)
+          workers = c.lrange(PROCESSES_KEY, 0, -1)
+        end
         num_workers = workers.size
         index       = workers.find_index(identity)
 

data/lib/process_balancer/rails.rb

@@ -17,10 +17,8 @@ module ProcessBalancer
         @app = app
       end
 
-      def call
-        @app.reloader.wrap do
-          yield
-        end
+      def call(&block)
+        @app.reloader.wrap(&block)
         # ensure
         # ActiveRecord::Base.clear_active_connections!
       end

data/lib/process_balancer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessBalancer
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

data/process_balancer.gemspec

@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'climate_control', '~> 0.2'
   spec.add_development_dependency 'fakefs', '~> 1.2.2'
-  spec.add_development_dependency 'mock_redis', '~> 0.23'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'mock_redis', '~> 0.24'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'redis-namespace', '~> 1.7'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
-  spec.add_development_dependency 'rubocop', '~> 0.83.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.39.0'
+  spec.add_development_dependency 'rubocop', '~> 1.3.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.0.0'
   spec.add_development_dependency 'simplecov', '~> 0.12'
 
   spec.add_dependency 'concurrent-ruby', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_balancer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Edward Rudd
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ homepage: http://github.com/
 licenses:
 - LGPLv3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,8 +266,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A self-balancing long-running job runner
 test_files: []