sponges 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0cac568a3c8a62e54982cfc0f148a3364ce621d
-  data.tar.gz: b43a3a61760b50152a5822530f40164cc3a8929d
+  metadata.gz: 7b193b36206a51da04f4e60d9415bbf839739b9b
+  data.tar.gz: 27a8cc10e491c9fd326d2fee7c6325e12ee78ab3
 SHA512:
-  metadata.gz: 03fc14026327a11541b3c6e64e2ace1589ef4082e99db43c3d37058ffc603a6e4639606c3cffc5ea1c8a14694183ccd753e1d6a619a24141884732bde5440dff
-  data.tar.gz: 21798560537ad2d3cded92ee268586a476eff76dceffd7746b7c74719dee87db4568e14a577205b276edc7aa12d8cccb7e13fefb672da6a48700948cb56ae95e
+  metadata.gz: 0f025d421b02df7c29b9a8933ed276befd503e4566708d2247d81404967ebb51600446ab74774dbfc17e343263e87c1271361da588bbdf7760f07519c9ed9bc6
+  data.tar.gz: b38c5679db7ba703a0d2a2315997b293b5265e930501c46fdec91fe9deb8a6b2bacf587803115dbf5b4feee44e0df9aae4a30247b08ed51d9686de1128037fcb

data/README.md

@@ -76,6 +76,9 @@ Sponges.configure do |config|
   config.size              = 3                    # optionnal, default to cpu's size
   config.daemonize         = true                 # optionnal, default to false
   config.port              = 5032                 # optionnal, default to 5032
+  # polling on supervisor, this is use to shutdown children in case supervisor
+  # receive a `SIGKILL` signal.
+  config.polling           = 60                   # optionnal, default to 60
   config.after_fork do
     puts "Execute code when a child process is created"
   end

data/lib/sponges.rb

@@ -7,7 +7,9 @@ require 'forwardable'
 require 'socket'
 require 'json'
 require_relative 'sponges/version'
+require_relative 'sponges/alive'
 require_relative 'sponges/configuration'
+require_relative 'sponges/worker'
 require_relative 'sponges/handler'
 require_relative 'sponges/response'
 require_relative 'sponges/listener'

data/lib/sponges/alive.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Sponges
+  module Alive
+    # Check processus presence by its pid.
+    #
+    # @param [Integer] pid
+    #
+    # @return [Boolean]
+    #
+    def alive?(pid)
+      !Sys::ProcTable.ps.find {|f| f.pid == pid }.nil?
+    end
+    private :alive?
+  end
+end

data/lib/sponges/commander.rb

@@ -6,6 +6,7 @@ module Sponges
   # messages like 'stop' or 'restart'
   #
   class Commander
+    include Sponges::Alive
     attr_reader :store
 
     def initialize(name, options = {})
@@ -105,10 +106,6 @@ module Sponges
       end
     end
 
-    def alive?(pid)
-      !Sys::ProcTable.ps.find {|f| f.pid == pid }.nil?
-    end
-
     def gracefully?
       !!@options[:gracefully]
     end

data/lib/sponges/configuration.rb

@@ -5,7 +5,8 @@ module Sponges
   class Configuration
     class << self
       ACCESSOR = [:worker_name, :worker, :logger, :size, :daemonize,
-                  :after_fork, :timeout, :gracefully, :store, :port
+                  :after_fork, :timeout, :gracefully, :store, :port,
+                  :polling
       ]
       attr_accessor *ACCESSOR
 
@@ -31,6 +32,10 @@ module Sponges
         @port || 5032
       end
 
+      def pooling
+        @pooling || 60
+      end
+
     end
   end
 

data/lib/sponges/handler.rb

@@ -120,12 +120,7 @@ module Sponges
 
     def fork_children
       name = children_name
-      pid = fork do
-        $PROGRAM_NAME = name
-        (Sponges::STOP_SIGNALS + [:HUP]).each{ |sig| trap(sig) { exit!(0) } }
-        Sponges::Hook.after_fork
-        supervisor.call
-      end
+      pid = Sponges::Worker.new(supervisor, name).call
       Sponges.logger.info "Supervisor create a child with #{pid} pid."
       store.add_children pid
     end

data/lib/sponges/version.rb

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

data/lib/sponges/worker.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+module Sponges
+  # This class helps building new workers.
+  #
+  class Worker
+    include Sponges::Alive
+    attr_reader :supervisor, :name
+
+    # Initialize an Worker with a supervisor and its future name
+    #
+    #
+    # @param [Sponges::Supervisor] supervisor
+    # @param [String] name
+    #
+    # @return [undefined]
+    #
+    def initialize(supervisor, name)
+      @supervisor, @name = supervisor, name
+    end
+
+    # Forks a brandly new worker.
+    #
+    # @return [Integer] Pid of the new worker
+    #
+    def call
+      fork do
+        $PROGRAM_NAME = name
+        (Sponges::STOP_SIGNALS + [:HUP]).each { |sig| trap(sig) { exit!(0) } }
+        trap_supervisor_sigkill!
+        Sponges::Hook.after_fork
+        supervisor.call
+      end
+    end
+
+    private
+
+    def trap_supervisor_sigkill!
+      Thread.new do
+        while alive?(supervisor.pid) do
+          Sponges.logger.debug Configuration.polling
+          sleep Configuration.polling
+        end
+        exit
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sponges
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - chatgris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -65,6 +65,7 @@ files:
 - LICENSE
 - README.md
 - lib/sponges.rb
+- lib/sponges/alive.rb
 - lib/sponges/cli.rb
 - lib/sponges/commander.rb
 - lib/sponges/configuration.rb
@@ -75,6 +76,7 @@ files:
 - lib/sponges/store.rb
 - lib/sponges/supervisor.rb
 - lib/sponges/version.rb
+- lib/sponges/worker.rb
 homepage: http://af83.github.com/sponges
 licenses: []
 metadata: {}