shexecutor 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183cea7f0c0edbb50faed8dd83fb9f520de34188
-  data.tar.gz: 0c233c7824237a02ac9780dd7f787f32678d08a4
+  metadata.gz: d9b5ff685f5736caeee4b7da6f4ffdc89df35f6f
+  data.tar.gz: 1adec7351ce61aab38684cd7eb42f61ca9f3c0a7
 SHA512:
-  metadata.gz: e9c31b3dc06489d8a93ec677eddd73a4225578ea32ecb0ecb5bb5b835095d18cb45e21d9ff0586af40d4d68464d856113600eff221f13108ffade8f9f0648576
-  data.tar.gz: 2835e4e2ae9dd50b0acf12d3e0550dcae0188cf90a1a78c712849dc4f1e354992d58a3ca4d4e61227e7c4c22e29664ebaaf2b7a2248ff772c921214c645af4f2
+  metadata.gz: 211b5d32097888858bf38f4dba7344cc7bc4b1cd08edd2c6d183d797ef6af7869a5685ecb0723e75b8f7fd19027afcd207e709ef585c4abcba282a85a064d06f
+  data.tar.gz: 1021ef30c0a794c7f73ce021c8361057b843e3f53f44a14cff90900c7348f41776d3f877ed3779b4f6a4063916cf2a6ad44d529ddc6034849f148f11803db449

data/lib/shexecutor/version.rb

@@ -1,3 +1,3 @@
 module SHExecutor
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/shexecutor.rb

@@ -158,24 +158,30 @@ module SHExecutor
       @t0 = nil
       Open3::popen3(application_path, options) do |stdin, stdout, stderr, thr|
         @t0 = thr
-        # read srderr and stdout into buffers to prevent blocking
+        # read stderr and stdout into buffers to prevent blocking
         t1 = Thread.new do
-          IO.copy_stream(stdout, data_out)
+          begin
+            IO.copy_stream(stdout, data_out)
+          end
         end
         t2 = Thread.new do
-          IO.copy_stream(stderr, data_err)
+          begin
+            IO.copy_stream(stderr, data_err)
+          end
         end
+        # 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.
+        t3 = Thread.new do
+          count = 0
+          while (count < @options[:timeout]*10) and (@t0.alive?) do
+            sleep 0.1
+            count = count + 1
+          end
+          raise Timeout::Error.new("execution expired") if @t0.alive?
+        end if should_timeout?
         stdin.close
-        #These streams should never produce IOErrors. If they do, memory is shot.
-        #Having them abort on exception interrupts TimeoutError, so turn abort of
-        #wanting to see timeouts
-        t1.abort_on_exception = false if should_timeout?
-        t2.abort_on_exception = false if should_timeout?
-        #No need to join here. t0 is joined by the caller.
-        #Explicitly join here if not configured for timeout to make the point that
-        #if you join here when configured for timeout, timeout will break, as the
-        #join will only finish when the thread finishes, i.e. the timeout exception
-        #will come too late
+        t3.abort_on_exception = true if should_timeout?
         t1.join if not should_timeout?
         t2.join if not should_timeout?
       end
@@ -192,9 +198,7 @@ module SHExecutor
     def block_process_with_timeout
       validate
       begin
-        Timeout.timeout(@options[:timeout]) do
-          @data_out, @data_err, @result = run_process(@options[:application_path], *@options[:params])
-        end
+        @data_out, @data_err, @result = run_process(@options[:application_path], *@options[:params])
         @result.join
         @result.value
       rescue Timeout::Error => ex
@@ -220,6 +224,8 @@ module SHExecutor
         sleep 0.1
       end
       Process.kill(9, pid) if process?(pid)
+    rescue Errno::ESRCH
+      #done
     end
 
     def fork_process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shexecutor
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ernst van Graan