dont-stall-my-process 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562d9b6a49097a22566602128f5a531c53e26330
-  data.tar.gz: 689944a6f09ea614d5180ccf54e0369201f75398
+  metadata.gz: 647fc238f71c4c106326724b91668330a65db0e0
+  data.tar.gz: 3aff9c4730cf3cd90335b0af9c7585d6514104d8
 SHA512:
-  metadata.gz: 9addba72c01ea9f16e49ebdc80ae723881472c2e528e81367e609275974811c12c8cfdd885570b2a4d5b1b06a5ea175a2d336dfd8d61a6a4051f8d89520a201d
-  data.tar.gz: 72d8f63b14088d706a116eb38088daf5dac20a4ba0ce85eb9cca1edfad2ce5c1740104d1bd06fc212d83324bf9fc9a7d90707cdbd0b01682dcf4c9203e3fe8be
+  metadata.gz: 2180e9b9c5be12218edf9ee900d474270ae44f53c8c1a333c6b4ba65d7dd29b32c5bcc55007f0d59a0aa52d38a54995c0b50ac374aef53a0a3f4e1960178d251
+  data.tar.gz: 795e77e6ba1693ea4e42c5410a93c12ee437c80c813b3e92bb300e5e550f9241bb4b3f02e3de24ee398bc677e13cbade7a3834e2e97718397be00c09ad53d1cb

data/lib/dont-stall-my-process.rb

@@ -1,11 +1,11 @@
 require 'dont-stall-my-process/configuration'
 require 'dont-stall-my-process/exceptions'
 require 'dont-stall-my-process/proxy_registry'
+require 'dont-stall-my-process/process_exit_handler'
 require 'dont-stall-my-process/version'
 require 'dont-stall-my-process/local/child_process'
 require 'dont-stall-my-process/local/child_process_pool'
 require 'dont-stall-my-process/local/local_proxy'
-require 'dont-stall-my-process/local/process_exit_handler'
 require 'dont-stall-my-process/remote/remote_application'
 require 'dont-stall-my-process/remote/remote_application_controller'
 require 'dont-stall-my-process/remote/remote_proxy'

data/lib/dont-stall-my-process/configuration.rb

@@ -3,8 +3,8 @@ module DontStallMyProcess
     DEFAULT_TIMEOUT = 300
 
     ATTRIBUTES = [:sigkill_only, :close_stdio, :restore_all_traps, :skip_at_exit_handlers,
-      :process_pool_size, :subprocess_name, :after_fork_handler]
-    attr_writer *(ATTRIBUTES - [:after_fork_handler])
+      :process_pool_size, :subprocess_name, :before_fork_handler, :after_fork_handler]
+    attr_writer *(ATTRIBUTES - [:before_fork_handler, :after_fork_handler])
 
     def initialize
       @sigkill_only          = false
@@ -12,10 +12,17 @@ module DontStallMyProcess
       @restore_all_traps     = false
       @skip_at_exit_handlers = false
       @process_pool_size     = nil
+      @before_fork_handler   = Proc.new {}
       @after_fork_handler    = Proc.new {}
       @subprocess_name       = nil
     end
 
+
+    def before_fork(p = nil, &block)
+      fail 'before_fork needs a block or Proc object' unless (p && p.is_a?(Proc)) || block_given?
+      @before_fork_handler = p || block
+    end
+
     def after_fork(p = nil, &block)
       fail 'after_fork needs a block or Proc object' unless (p && p.is_a?(Proc)) || block_given?
       @after_fork_handler = p || block

data/lib/dont-stall-my-process/local/child_process.rb

@@ -7,17 +7,16 @@ module DontStallMyProcess
       attr_reader :pid
 
       def initialize
-        # Start RemoteApplication in child process, connect to it thru pipe.
         r, w = IO.pipe
+
+        # Call the before_fork handler now, so the client can clean up the main
+        # process a bit.
+        Configuration.before_fork_handler.call
+
+        # Start RemoteApplication in child process, connect to it thru pipe.
         @pid = fork do
           r.close
 
-          # Disable process cleanup, otherwise killing the
-          # subprocess (when Configuration.skip_at_exit_handlers is false) will
-          # terminate all the other subprocesses, or at least screw with their
-          # unix sockets.
-          ProcessExitHandler.disable_at_exit
-
           app = DontStallMyProcess::Remote::RemoteApplication.new(w)
           app.loop!
         end

data/lib/dont-stall-my-process/process_exit_handler.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+
+module DontStallMyProcess
+  class ProcessExitHandler
+    def self.disable_at_exit
+      @at_exit_disabled = true
+    end
+
+    def self.at_exit_disabled?
+      @at_exit_disabled
+    end
+
+    at_exit do
+      # If we're in a subprocess, this handler should not run.
+      unless ProcessExitHandler.at_exit_disabled?
+
+        # Make sure we terminate all subprocesses when
+        # the main process exits.
+        Local::ChildProcessPool.each do |process|
+          process.quit
+        end
+
+        # Clean remaining unix sockets from /tmp.
+        FileUtils.rm(Dir["/tmp/dsmp-#{Process.pid}*"])
+      end
+    end
+  end
+end

data/lib/dont-stall-my-process/remote/remote_application.rb

@@ -11,6 +11,12 @@ module DontStallMyProcess
       end
 
       def initialize(pipe)
+        # Disable process cleanup, otherwise killing the
+        # subprocess (when Configuration.skip_at_exit_handlers is false) will
+        # terminate all the other subprocesses, or at least screw with their
+        # unix sockets.
+        ProcessExitHandler.disable_at_exit
+
         # Do not write to stdout/stderr unless requested by the client.
         if Configuration.close_stdio
           $stdout.reopen('/dev/null', 'w')

data/lib/dont-stall-my-process/version.rb

@@ -1,3 +1,3 @@
 module DontStallMyProcess
-  VERSION = '0.1.2'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dont-stall-my-process
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies: []
 description: Executes code or native extensions in child processes and monitors their
   execution times
@@ -23,7 +23,7 @@ files:
 - lib/dont-stall-my-process/local/child_process.rb
 - lib/dont-stall-my-process/local/child_process_pool.rb
 - lib/dont-stall-my-process/local/local_proxy.rb
-- lib/dont-stall-my-process/local/process_exit_handler.rb
+- lib/dont-stall-my-process/process_exit_handler.rb
 - lib/dont-stall-my-process/proxy_registry.rb
 - lib/dont-stall-my-process/remote/remote_application.rb
 - lib/dont-stall-my-process/remote/remote_application_controller.rb

data/lib/dont-stall-my-process/local/process_exit_handler.rb

@@ -1,30 +0,0 @@
-require 'fileutils'
-
-module DontStallMyProcess
-  module Local
-    class ProcessExitHandler
-      def self.disable_at_exit
-        @at_exit_disabled = true
-      end
-
-      def self.at_exit_disabled?
-        @at_exit_disabled
-      end
-
-      at_exit do
-        # If we're in a subprocess, this handler should not run.
-        unless ProcessExitHandler.at_exit_disabled?
-
-          # Make sure we terminate all subprocesses when
-          # the main process exits.
-          ChildProcessPool.each do |process|
-            process.quit
-          end
-
-          # Clean remaining unix sockets from /tmp.
-          FileUtils.rm(Dir["/tmp/dsmp-#{Process.pid}*"])
-        end
-      end
-    end
-  end
-end