scout-gear 10.10.1 → 10.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2debf30c7757ca3bd5ce191b99ce173bc31ea86e814933f4f7589a83ef49517
-  data.tar.gz: 6ad6353a5e9eeade8169c76d3f0b1501f8f9d02fa1e826538e15e152e79582ad
+  metadata.gz: 5f8aff3d8f7e3fc85a03340ec43ac1544b724a20de30e1607e1b07f6812099c7
+  data.tar.gz: 75685ce3a5868a2f21f71527fbbc69f46f758d279d393c2d1fc48c64ffa786f0
 SHA512:
-  metadata.gz: bead6f4347748fc7365d6e24da5259417a8f3ea802ae5dbfaebc1056af062fb7af0b463eed3fe9669c7321e701daaf0fcf04245563a288feb682f9e2ff54ef29
-  data.tar.gz: 20874d977a84fab65c3c3bc50c96d48976a577f697d8e8db22b83de49b576639d1bae93a6ce604bb34cfdd86ed0fbf24baadd212077992797c2f955162139623
+  metadata.gz: 2e20ac4a92bfed76ea6967cc3441ebf0bd33f72203592dec178f88edb094e30be01f2fc84e749f002be5987baffd2e10a7a0b9653bc0ef14c04da31633306f89
+  data.tar.gz: 12bc3dbcad9f8ba28c6472fadc6f525813a02f4a631010422f01984753f39e429e5ea8cf958bc2e160ccd11d6bc8a798251b32043b1b63fc4cc9960d2ec9281c

data/VERSION

@@ -1 +1 @@
-10.10.1
+10.11.0

data/lib/scout/work_queue/worker.rb

@@ -1,5 +1,8 @@
 class WorkQueue
   class Worker
+    EXIT_STATUS=246
+    SIGNAL='ABRT'
+
     attr_accessor :pid, :ignore_ouput, :queue_id
     def initialize(ignore_ouput = false)
       @ignore_output = ignore_ouput
@@ -15,7 +18,10 @@ class WorkQueue
 
     def run
       @pid = Process.fork do
-        Signal.trap("INT") do
+        Signal.trap(SIGNAL) do
+          Kernel.exit! EXIT_STATUS
+        end
+        Signal.trap('INT') do
           Kernel.exit! -1
         end
         Log.low "Worker start #{worker_id}"
@@ -46,7 +52,7 @@ class WorkQueue
           begin
             output.write WorkerException.new($!, Process.pid)
           ensure
-            exit -1
+            exit EXIT_STATUS
           end
         end
         exit 0
@@ -56,7 +62,7 @@ class WorkQueue
     def abort
       begin
         Log.medium "Aborting worker #{worker_id}"
-        Process.kill "INT", @pid
+        Process.kill SIGNAL, @pid
       rescue Errno::ECHILD 
       rescue Errno::ESRCH
       end

data/lib/scout/work_queue.rb

@@ -71,13 +71,15 @@ class WorkQueue
         Thread.current.report_on_exception = false
         Thread.current["name"] = "Output reader #{queue_id}"
         @done_workers ||= []
-        while true
-          obj = @output.read
+        #while true
+        #  obj = @output.read
+        while obj = @output.read
           if DoneProcessing === obj
 
             done = @worker_mutex.synchronize do
               Log.low "Worker #{obj.pid} from #{queue_id} done"
               @done_workers << obj.pid
+              #@closed && (@workers.empty? || @workers.length == @removed_workers.length + @done_workers.length)
               @closed && @done_workers.length == @removed_workers.length + @workers.length
             end
 
@@ -113,14 +115,29 @@ class WorkQueue
         break if @worker_mutex.synchronize{ @workers.empty? }
         threads = @workers.collect do |w|
           t = Thread.new do
+            Thread.report_on_exception = false
             Thread.current["name"] = "Worker waiter #{queue_id} worker #{w.pid}"
             pid, status = Process.wait2 w.pid
             remove_worker(pid) if pid
+            #@output.write WorkerException.new(Exception.new("Worker ended with status #{status.exitstatus}"), pid) unless status.success?
+            raise Exception.new("Worker #{pid} ended with status #{status.exitstatus}") unless (status.success? || status.exitstatus == WorkQueue::Worker::EXIT_STATUS)
           end
           Thread.pass until t["name"]
           t
         end
-        threads.each do |t| t.join end
+        exceptions = []
+        threads.each do |t| 
+          begin
+            t.join 
+          rescue
+            exceptions << $!
+          end
+        end
+
+        raise exceptions.first if exceptions.any?
+        if @workers.empty? && ! @closed
+          @output.write DoneProcessing.new
+        end
       end
     end
 

data/lib/scout/workflow/task/inputs.rb

@@ -91,7 +91,7 @@ module Task
     basename = File.basename(orig_file)
     digest = Misc.digest(orig_file)
     if basename.include? '.'
-      basename.sub!(/(.*)\.(.*)/, '\1-' + digest + '.\2')
+      basename = basename.sub(/(\.[^.]+(?:\.[^.]+)*)?$/, "-#{digest}\\1")
     else
       basename += "-#{digest}"
     end
@@ -158,7 +158,7 @@ module Task
       elsif filename.end_with?('.as_path')
         value = Open.read(filename).strip
         Path.setup value
-      elsif (options &&  (options[:noload] || options[:stream] || options[:nofile] || options[:asfile]))
+      elsif type.to_s == 'file' || (options &&  (options[:noload] || options[:stream] || options[:nofile] || options[:asfile]))
         filename
       else
         Persist.load(filename, type)

data/scout-gear.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-gear 10.10.1 ruby lib
+# stub: scout-gear 10.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-gear".freeze
-  s.version = "10.10.1".freeze
+  s.version = "10.11.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -282,7 +282,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-gear".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.7.0.dev".freeze
+  s.rubygems_version = "3.7.2".freeze
   s.summary = "basic gear for scouts".freeze
 
   s.specification_version = 4

data/test/scout/test_work_queue.rb

@@ -172,5 +172,46 @@ class TestWorkQueue < Test::Unit::TestCase
       end
     end
   end
+
+  def test_processed_killed
+    num = 10
+    reps = 3000
+
+    q = WorkQueue.new num do |obj|
+      sleep 0.01
+      [Process.pid.to_s, obj.to_s] * " "
+    end
+
+    res = []
+    q.process do |out|
+      res << out
+    end
+
+    t = Thread.new do
+      Thread.current.report_on_exception = false
+      Thread.current["name"] = "queue writer"
+      reps.times do |i|
+        q.write i
+      end
+      q.close
+    end
+    Thread.pass until t["name"]
+
+    sleep 1
+
+    assert_raise Exception do
+      Process.kill 'INT', q.workers.first.pid
+      begin
+        t.join
+        q.join(false)
+      rescue Exception
+        t.raise($!)
+        raise $!
+      ensure
+        t.join
+        q.clean
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 10.10.1
+  version: 10.11.0
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.7.2
 specification_version: 4
 summary: basic gear for scouts
 test_files: []