pebbles-river 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4bc47f2039f74ecd2da833ce7c18e8335503e845
+  data.tar.gz: c67d6c720fe6e37e978ee2c3d0029cf6d6947ce6
+SHA512:
+  metadata.gz: 9bafbd8b49a3f568e85c6a682d32d9c92813b31b4217751cad7733a44b55fc73cfc408912c02adef1531902be4adfd0e832774fd441cca56a0af07834fd2fce6
+  data.tar.gz: 4d1733af9cde03f3ed7f3565584c6ba20f84b89eb8fb9f35e1790026996f26e97e3cdf9784c390dd61b20209e4ceeb19d719c047fd7f048cf995d47930808619

data/lib/pebbles/river/supervisor.rb

@@ -13,9 +13,9 @@ module Pebbles
         options.assert_valid_keys(:logger, :pid_file, :worker_count, :worker)
 
         @worker_count = options[:worker_count] || 1
-
         @prefork_pools = []
         @worker_modules = []
+        @recovering = true
       end
 
       def start_workers
@@ -23,11 +23,13 @@ module Pebbles
           raise ConfigurationError.new("No listeners configured")
         end
 
-        @worker_modules.each do |min_worker_count, m|
-          @prefork_pools.push(
-            Servolux::Prefork.new(
-              min_workers: min_worker_count,
-              module: m))
+        @worker_modules.each do |name, min_worker_count, m|
+          if min_worker_count > 0
+            prefork = Servolux::Prefork.new(min_workers: min_worker_count, module: m)
+            @prefork_pools.push([name, prefork])
+          else
+            logger.info "[#{name}] Workers disabled"
+          end
         end
       end
 
@@ -53,15 +55,17 @@ module Pebbles
             end
           })
 
-        process_name = "#{@name}: queue worker: #{queue_spec[:name]}"
+        name = queue_spec[:name]
+
+        process_name = "#{@name}: queue worker: #{name}"
         logger = @logger
         worker_count = worker_options[:worker_count] || @worker_count
 
-        @worker_modules.push([worker_count, Module.new {
+        @worker_modules.push([name, worker_count, Module.new {
           define_method :execute do
             $0 = process_name
             trap('TERM') do
-              logger.info "Worker received TERM"
+              logger.info "[#{name}] Worker received TERM, stopping"
               worker.stop
               exit(0)
             end
@@ -72,11 +76,12 @@ module Pebbles
 
       # From Servolux::Server
       def before_starting
-        $0 = "#{name}: master"
+        $0 = "#{self.name}: master"
 
         logger.info "Starting workers"
-        @prefork_pools.each do |prefork|
-          prefork.start(1)
+        @prefork_pools.each do |name, prefork|
+          logger.info "[#{name}] Starting workers"
+          prefork.ensure_worker_pool_size
         end
       end
 
@@ -92,9 +97,7 @@ module Pebbles
 
       # From Servolux::Server
       def run
-        @prefork_pools.each do |prefork|
-          prefork.ensure_worker_pool_size
-        end
+        ensure_workers
       rescue => e
         if logger.respond_to? :exception
           logger.exception(e)
@@ -106,12 +109,51 @@ module Pebbles
 
       private
 
+        def ensure_workers
+          complete = true
+          @prefork_pools.each do |name, prefork|
+            if prefork.below_minimum_workers?
+              complete = false
+            else
+              had_workers = true
+            end
+
+            prefork.prune_workers
+
+            if had_workers and prefork.below_minimum_workers?
+              logger.error "[#{name}] One or more worker died"
+            end
+
+            while prefork.below_minimum_workers? do
+              @recovering = true
+              logger.info "[#{name}] Too few workers (" \
+                "#{prefork.live_worker_count} alive, #{prefork.dead_worker_count} dead), spawning another"
+              prefork.add_workers(1)
+            end
+          end
+
+          if @recovering and complete
+            @recovering = false
+            logger.info "All workers up"
+          end
+        end
+
         def shutdown_workers
-          logger.info "Shutting down all workers"
-          @prefork_pools.each(&:stop)
+          logger.info "Telling all workers to shut down"
+          @prefork_pools.each do |name, prefox|
+            prefox.stop
+          end
+
+          last_logged_time = Time.now
           loop do
-            break if @prefork_pools.all? { |prefork| prefork.live_worker_count <= 0 }
-            logger.info "Waiting for workers to quit"
+            count = @prefork_pools.inject(0) { |sum, (name, prefork)| sum + prefork.live_worker_count }
+            break if count == 0
+
+            if Time.now - last_logged_time > 5
+              logger.info "Still waiting for #{count} workers to quit..."
+              last_logged_time = Time.now
+            end
+
             sleep 0.25
           end
         end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/lib/pebbles/river/worker.rb

@@ -119,7 +119,7 @@ module Pebbles
 
         def process_next
           with_exceptions do
-            queue.pop(ack: true) do |delivery_info, properties, content|
+            queue.pop(manual_ack: true) do |delivery_info, properties, content|
               if delivery_info
                 process_message(delivery_info, properties, content)
                 return true

data/pebbles-river.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'pebblebed', '~> 0.3.0'
+  spec.add_runtime_dependency 'pebblebed', '>= 0.3.0'
   spec.add_runtime_dependency 'bunny', '= 1.6.0.rc2'
   spec.add_runtime_dependency 'activesupport', '>= 3.0'
   spec.add_runtime_dependency 'servolux', '~> 0.10'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexander Staubo
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -47,113 +42,99 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: servolux
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Implements an event river mechanism for Pebblebed.
@@ -163,7 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -189,27 +170,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Implements an event river mechanism for Pebblebed.
 test_files:
 - spec/lib/river_spec.rb
@@ -217,3 +197,4 @@ test_files:
 - spec/lib/subscription_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb
+has_rdoc: