shexecutor 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5339cd977bce2d3fc0afd8e1e91a0acca62226
-  data.tar.gz: 8480574bea646115896463bfea7bebd317d08462
+  metadata.gz: f5a90086a0b0551fc5c8296e15e8261a6c05103e
+  data.tar.gz: b471206bf6fe04e173ca72e5690eace7e922233f
 SHA512:
-  metadata.gz: 5bcf1d372db5a9be80f1e226116bb5d62f56c0562d4a1e5c1e2ae1845896e669edf46451abeca9a510ffb37d8c2cad3b6879f6f34eff4eebd1cc7ccb767015cc
-  data.tar.gz: f03082a03fa5972324e69912f64f80e8eb73290bf317071958c0be7063f5b865de3bd4de2d4bd371ee44594ac7f90e86add35fb7bb299c3c73e2d1c935814a95
+  metadata.gz: e7eaf4861a28bac3294e80ab2745261693f3cadba1f84b07ed78337c4c325f728ea0c94196d99725b857c3d9debbdc31fe5c89cc569bb798642863331c05fb73
+  data.tar.gz: e62998f6d86fb8ae0200cf880b7c4dc29e6a3dc4ee62dc4147e4cae09709e1b68f0c2a318dd268ea4b290e42b7a803e1f042107c94e491358afcd39696ed7489

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shexecutor (0.0.14)
+    shexecutor (0.0.15)
 
 GEM
   remote: https://rubygems.org/

data/lib/shexecutor/version.rb

@@ -1,3 +1,3 @@
 module SHExecutor
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/lib/shexecutor.rb

@@ -162,11 +162,15 @@ module SHExecutor
         t1 = Thread.new do
           begin
             IO.copy_stream(stdout, data_out)
+          rescue Exception => ex
+            raise TimeoutError.new("execution expired") if @timeout_error
           end
         end
         t2 = Thread.new do
           begin
             IO.copy_stream(stderr, data_err)
+          rescue Exception => ex
+            raise TimeoutError.new("execution expired") if @timeout_error
           end
         end
         m = Mutex.new
@@ -174,6 +178,7 @@ module SHExecutor
         # track timeout if required. Do this ourselves since the mechanism
         # is simple and Timeout struggles from multi-threading issues.
         # IO.copy_stream stop the Timeout exception from being thrown properly.
+        timedout = false
         t3 = Thread.new do
           count = 0
           while (count < @options[:timeout]*10) and (@t0.alive?) do
@@ -181,11 +186,15 @@ module SHExecutor
             count = count + 1
           end
           m.synchronize do
+            if count >= @options[:timeout]*10
+              timedout = true
+            end
             done = true
-            raise Timeout::Error.new("execution expired") if @t0.alive?
           end
         end if should_timeout?
         stdin.close
+        t1.abort_on_exception = true if should_timeout?
+        t2.abort_on_exception = true if should_timeout?
         t3.abort_on_exception = true if should_timeout?
         t1.join if not should_timeout?
         t2.join if not should_timeout?
@@ -200,9 +209,14 @@ module SHExecutor
               d = done
             end
           end
-          t1.join if not @t0.alive?
-          t2.join if not @t0.alive? 
-          t3.join if not @t0.alive?
+
+          if not timedout
+            t1.join 
+            t2.join
+            t3.join
+          else
+            @timeout_error = true
+          end
         end
       end
       return data_out, data_err, @t0
@@ -219,6 +233,7 @@ module SHExecutor
       validate
       begin
         @data_out, @data_err, @result = run_process(@options[:application_path], *@options[:params])
+        raise Timeout::Error.new("execution expired") if @timeout_error
         @result.join
         @result.value
       rescue Timeout::Error => ex
@@ -236,6 +251,13 @@ module SHExecutor
       end
     end
 
+    def kill_9_process(pid)
+      return if pid.nil?
+      Process.kill(9, pid)
+    rescue Errno::ESRCH
+      #done
+    end
+
     def kill_process(pid)
       return if pid.nil?
       Process.kill("TERM", pid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shexecutor
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler