iso_latte 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5780f40ea4f18590135725740fccd26e885510fd
-  data.tar.gz: 3201f17dad3af7bf0be4ae3b42596601f7c9b62a
+  metadata.gz: 929b7df9ff0f59ee35cd1b20f0d861d37c8ebfef
+  data.tar.gz: 6288dd0d0dae3ca40bd5c91387def5961c3e55af
 SHA512:
-  metadata.gz: 86beb89d8fcfb691d81748deb32169fbf4aa41aa4c43c0cccfd49d901f25c5dfa2430588f44e2cc2986013aa73975a64ae1aec5104096ce98a2c7bde780ee91a
-  data.tar.gz: fe992f6f80a746bcdbd5287d77c760498a221a8c5be79d8cdcf8ad960b9f9d957f4a7a16e78ccbb39c3f1fc72eaec714557e73800f11ef6d5eb62af724ee91b5
+  metadata.gz: bb1e74442a0cf7f03bcf239eb84d0d3b18863f466e14592e099c8f3c16990d8b4764de49d70b6572442c4a7b611a199594ab11ce60805e948bfa0990e85241ed
+  data.tar.gz: 08c505d181c5945db613e60d1848d2988fbca6a9c7f888887b7fdbee0aa5af7c221845c57d98e67a7d8eea19e39f4fb911f6e2e829aba8a4b02c459c71127fe2

data/lib/iso_latte/version.rb

@@ -1,3 +1,3 @@
 module IsoLatte
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/lib/iso_latte.rb

@@ -1,4 +1,5 @@
 require "ostruct"
+require "timeout"
 
 module IsoLatte
   NO_EXIT = 122
@@ -16,6 +17,7 @@ module IsoLatte
   #   fault:    a callable to execute if the subprocess segfaults, core dumps, etc.
   #   exit:     a callable to execute if the subprocess voluntarily exits with nonzero.
   #             receives the exit status value as its argument.
+  #   timeout:  after this many seconds, the parent should send a SIGKILL to the child.
   #
   # It is allowable to Isolatte.fork from inside an IsoLatte.fork block (reentrant)
   #
@@ -59,7 +61,17 @@ module IsoLatte
 
     write_ex.close
 
-    pid, rc = Process.wait2(child_pid)
+    pid, rc =
+      begin
+        if opts.timeout
+          Timeout.timeout(opts.timeout) { Process.wait2(child_pid) }
+        else
+          Process.wait2(child_pid)
+        end
+      rescue Timeout::Error
+        kill_child(child_pid)
+      end
+
     fail(Error, "Wrong child's exit received!") unless pid == child_pid
 
     if rc.exited? && rc.exitstatus == EXCEPTION_RAISED
@@ -84,8 +96,18 @@ module IsoLatte
     # *explicitly* exited, whether with zero or nonzero.
     opts.exit.call(rc.exitstatus) if opts.exit && rc.exited? && rc.exitstatus != NO_EXIT
 
-    # This should execute *no matter what*
+    # This should execute regardless of the outcome
+    # (unless some other hook raises an exception first)
     opts.finish.call(success, code) if opts.finish
+
+    rc
+  end
+
+  def self.kill_child(pid)
+    Process.kill("KILL", pid)
+    Process.wait2(pid)
+  rescue Errno::ESRCH
+    # Save us from the race condition where it exited just as we decided to kill it.
   end
 
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso_latte
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Emcien Engineering