pebbles-river 0.1.1 → 0.1.3

data/lib/pebbles/river/daemon_helper.rb

@@ -11,10 +11,10 @@ module Pebbles
     #
     # * `name`: Name of the process. Optional, defaults to `$0`.
     #
-    # * `configure_start_command(command)`. Implement to add more options to
-    #   the start command, eg. configuration options. Optional.
+    # * `configure_start_command(command)`. Implement to add more
+    #   options to the start command, eg. configuration options. Optional.
     #
-    # * `on_start(options)`. Implement to inject code before the program
+    # * `on_start(options, helper)`. Implement to inject code before the program
     #   starts. Options are the start options, a hash. Optional.
     #
     # * `configure_supervisor(supervisor)`. This must call `add_listener` on the
@@ -22,6 +22,12 @@ module Pebbles
     #
     class DaemonHelper
 
+      attr_accessor :logger
+
+      def self.run(adapter, options = {})
+        new(adapter, options).run
+      end
+
       def initialize(adapter, options = {})
         @adapter = adapter
 
@@ -41,7 +47,9 @@ module Pebbles
             c.option :pidfile, '-p', '--pidfile PIDFILE', 'Path to pid file.'
             c.option :workers, Integer, '-w', '--workers N', 'Set number of workers per queue (defaults to 1).'
             c.action do |_, options|
-              start(options)
+              handle_exceptions do
+                start(options)
+              end
             end
             if @adapter.respond_to?(:configure_start_command)
               @adapter.configure_start_command(c)
@@ -52,7 +60,9 @@ module Pebbles
             c.description 'Stops daemon'
             c.option :pidfile, '-p', '--pidfile PIDFILE', 'Path to pid file.'
             c.action do |_, options|
-              stop(options)
+              handle_exceptions do
+                stop(options)
+              end
             end
           end
           p.command(:status) do |c|
@@ -60,7 +70,9 @@ module Pebbles
             c.description 'Prints daemon status'
             c.option :pidfile, '-p', '--pidfile PIDFILE', 'Path to pid file.'
             c.action do |_, options|
-              status(options)
+              handle_exceptions do
+                status(options)
+              end
             end
           end
         end
@@ -76,7 +88,7 @@ module Pebbles
 
         def start(options)
           if @adapter.respond_to?(:on_start)
-            @adapter.on_start(options)
+            @adapter.on_start(options, self)
           end
 
           daemon = new_daemon(options)
@@ -146,6 +158,17 @@ module Pebbles
             nochdir: true)
         end
 
+        def handle_exceptions(&block)
+          yield
+        rescue => e
+          if @logger.respond_to?(:exception)
+            @logger.exception(e)
+          end
+          $stderr.puts "Error: #{e.class}: #{e}"
+          $stderr.puts e.backtrace.map { |s| "\t#{s}\n" }.join
+          exit(1)
+        end
+
     end
 
   end

data/lib/pebbles/river/river.rb

@@ -22,12 +22,14 @@ module Pebbles
       def connect
         unless @session
           handle_session_error do
-            @session = Bunny::Session.new
-            @session.start
+            session = Bunny::Session.new
+            session.start
 
-            @channel = @session.create_channel
+            channel = session.create_channel
 
-            @exchange = @channel.exchange(exchange_name, EXCHANGE_OPTIONS.dup)
+            exchange = channel.exchange(exchange_name, EXCHANGE_OPTIONS.dup)
+
+            @session, @channel, @exchange = session, channel, exchange
           end
         end
       end

data/lib/pebbles/river/supervisor.rb

@@ -12,17 +12,22 @@ module Pebbles
 
         @worker_count = options[:worker_count] || 1
 
-        @queue_modules = []
+        @prefork_pools = []
+
+        @worker_modules = []
       end
 
       def start_workers
-        if @queue_modules.empty?
+        if @worker_modules.empty?
           raise ConfigurationError.new("No listeners configured")
         end
 
-        @prefork = MultiPrefork.new(
-          min_workers: @worker_count,
-          modules: @queue_modules)
+        @worker_modules.each do |m|
+          @prefork_pools.push(
+            Servolux::Prefork.new(
+              min_workers: @worker_count,
+              module: m))
+        end
       end
 
       def add_listener(listener, queue_spec)
@@ -39,10 +44,16 @@ module Pebbles
         process_name = "#{@name}: queue worker: #{queue_spec[:name]}"
         logger = @logger
 
-        @queue_modules.push(-> {
-          $0 = process_name
-          trap('TERM') { worker.stop }
-          worker.run
+        @worker_modules.push(Module.new {
+          define_method :execute do
+            $0 = process_name
+            trap('TERM') do
+              logger.info "Worker received TERM"
+              worker.stop
+              exit(0)
+            end
+            worker.run
+          end
         })
       end
 
@@ -51,7 +62,9 @@ module Pebbles
         $0 = "#{name}: master"
 
         logger.info "Starting workers"
-        @prefork.start(1)
+        @prefork_pools.each do |prefork|
+          prefork.start(1)
+        end
       end
 
       # From Servolux::Server
@@ -66,7 +79,9 @@ module Pebbles
 
       # From Servolux::Server
       def run
-        @prefork.ensure_worker_pool_size
+        @prefork_pools.each do |prefork|
+          prefork.ensure_worker_pool_size
+        end
       rescue => e
         if logger.respond_to? :exception
           logger.exception(e)
@@ -80,9 +95,9 @@ module Pebbles
 
         def shutdown_workers
           logger.info "Shutting down all workers"
-          @prefork.stop
+          @prefork_pools.each(&:stop)
           loop do
-            break if @prefork.live_worker_count <= 0
+            break if @prefork_pools.all? { |prefork| prefork.live_worker_count <= 0 }
             logger.info "Waiting for workers to quit"
             sleep 0.25
           end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.1.1'
+    VERSION = '0.1.3'
   end
 end

data/lib/pebbles/river.rb

@@ -8,7 +8,6 @@ require 'servolux'
 require_relative "river/version"
 require_relative "river/errors"
 require_relative "river/message"
-require_relative "river/multi_prefork"
 require_relative "river/worker"
 require_relative "river/subscription"
 require_relative "river/supervisor"
@@ -16,5 +15,4 @@ require_relative "river/routing"
 require_relative "river/river"
 require_relative "river/compatibility"
 require_relative "river/rate_limiter"
-require_relative "river/multi_prefork"
 require_relative "river/daemon_helper"

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: servolux
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,6 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -154,7 +173,6 @@ files:
 - lib/pebbles/river/daemon_helper.rb
 - lib/pebbles/river/errors.rb
 - lib/pebbles/river/message.rb
-- lib/pebbles/river/multi_prefork.rb
 - lib/pebbles/river/rate_limiter.rb
 - lib/pebbles/river/river.rb
 - lib/pebbles/river/routing.rb
@@ -171,26 +189,27 @@ 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: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Implements an event river mechanism for Pebblebed.
 test_files:
 - spec/lib/river_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzUyMjRmYmNiMDMxODU5NTYwMjYxZjg1ZWE1ZmJkZDg2ZWE5NzY0Zg==
-  data.tar.gz: !binary |-
-    ZDc2ZjlmNzFkMWUxYWQ5NTk3NzkwZmNjMDQ1NGYwN2FmY2UwYjJlNg==
-SHA512:
-  metadata.gz: !binary |-
-    MzBjMDMzY2VhOTMwMDIzMjM4NTY5MGRjNzJkYzM0NTM2MGVmZGM5ZmZkNzUw
-    NTdjOWEzMWI1NDUyNjc0MzI2OWVhMjIxNTdmYTEzNmY4YmM5NTg4NzAzYzUw
-    ZTMyNjFiNjYxMTgxYWQxY2UzNTI5NjkyYjMzYjhmMDE4MTRkZDM=
-  data.tar.gz: !binary |-
-    YzRjMWUyZmFmMWQxNDA4NWMzNDE5MTYxYTQ1NzJjYjJmZjk5Zjc1MTIxYjNl
-    YjZmNTQ3ZDJjYTc4NmRkODZjNTdkM2I5ZTk5YjdhNTk3MzA5MzMxYTZmOWNi
-    NzhiZTBjNDIwMmVhZDgxODMyY2M4OGU1MGRjYzE4YmI2OWFlYzk=

data/lib/pebbles/river/multi_prefork.rb

@@ -1,49 +0,0 @@
-module Pebbles
-  module River
-
-    # Overrides preforker to instantiate a round-robin set of modules. The
-    # desired worker count is multiplied by the number of modules; for example,
-    # if specifying modules [A, B] and the worker count is 2, then 4 actual
-    # processes will be forked.
-    class MultiPrefork < ::Servolux::Prefork
-
-      def initialize(options, &block)
-        raise ArgumentError, "Block invocation not supported" if block
-        raise ArgumentError, "Must pass :modules, not :module" if options[:module]
-
-        # Like Prefork we support passing procs
-        @modules = options[:modules].map { |m|
-          if m.is_a?(Proc)
-            Module.new { define_method :execute, &m }
-          else
-            m
-          end
-        }
-        @index = 0
-
-        options = {}.merge(options)
-        options[:module] = @modules.first
-        options.delete(:modules)
-        if (min_workers = options[:min_workers])
-          options[:min_workers] = min_workers * @modules.length
-        end
-        if (max_workers = options[:max_workers])
-          options[:max_workers] = max_workers * @modules.length
-        end
-
-        super(options)
-      end
-
-      # This cheats by overriding `Prefork#add_workers` and replacing the
-      # `@module instance` variable.
-      def add_workers(number = 1)
-        number.times do
-          @module = @modules[@index]
-          super(1)
-          @index = (@index + 1) % @modules.length
-        end
-      end
-    end
-
-  end
-end