sponges 0.1.3 → 0.2.0

data/README.md

@@ -63,12 +63,19 @@ end
 Sponges.configure do |config|
   config.logger        = MyCustomLogger.new   # optionnal
   config.redis         = Redis.new            # optionnal
+  config.size          = 3
+  config.daemonize     = true
+  config.after_fork do
+    puts "Execute some when a child process is created"
+  end
+  config.on_chld do
+    puts "Execute code when a child process is killed"
 end
 
 # Register a pool named "worker_name".
 # Options are optionnal. Consider it as a default, options given by command have
 # the precedence.
-Sponges.start "worker_name", {size: 3, daemonize: true} do
+Sponges.start "worker_name" do
   Worker.new({some: args}).run
 end
 ```

data/lib/sponges.rb

@@ -21,7 +21,6 @@ module Sponges
   def start(worker_name, options = {}, argv = ARGV, &block)
     Sponges::Configuration.worker_name = worker_name
     Sponges::Configuration.worker = block
-    Sponges::Configuration.options = options
     Sponges::Cli.start(argv)
   end
   module_function :start

data/lib/sponges/cli.rb

@@ -7,7 +7,10 @@ module Sponges
     option :size,       type: :numeric
     desc "Start workers"
     def start(options = {})
-      options = Sponges::Configuration.options.merge(options)
+      options = {
+        size: Sponges::Configuration.size,
+        daemonize: Sponges::Configuration.daemonize
+      }.reject{|k, v| v.nil?}.merge(options)
       Sponges::Runner.new(Sponges::Configuration.worker_name, options,
                           Sponges::Configuration.worker
                          ).start

data/lib/sponges/configuration.rb

@@ -4,7 +4,9 @@ module Sponges
   #
   class Configuration
     class << self
-      ACCESSOR = [:worker_name, :worker, :logger, :redis, :options]
+      ACCESSOR = [:worker_name, :worker, :logger, :redis, :size,
+        :daemonize, :after_fork
+      ]
       attr_accessor *ACCESSOR
 
       def configure
@@ -17,6 +19,28 @@ module Sponges
           conf
         end
       end
+
+      def after_fork(&block)
+        Hook._after_fork = block
+      end
+
+      def on_chld(&block)
+        Hook._on_chld = block
+      end
+    end
+  end
+
+  class Hook
+    class << self
+      attr_accessor :_after_fork, :_on_chld
+
+      def after_fork
+        _after_fork.call if _after_fork.respond_to?(:call)
+      end
+
+      def on_chld
+        _on_chld.call if _on_chld.respond_to?(:call)
+      end
     end
   end
 end

data/lib/sponges/supervisor.rb

@@ -36,6 +36,7 @@ module Sponges
       name = children_name
       pid = fork do
         $PROGRAM_NAME = name
+        Sponges::Hook.after_fork
         @block.call
       end
       Sponges.logger.info "Supervisor create a child with #{pid} pid."
@@ -71,6 +72,7 @@ module Sponges
             if dead
               Sponges.logger.warn "Child #{dead} died. Restarting a new one..."
               @pids.srem dead
+              Sponges::Hook.on_chld
               fork_children
             end
           rescue Errno::ECHILD => e

data/lib/sponges/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sponges
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson