rbbt-util 5.21.122 → 5.21.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3570acbd38ac9c6559cabbfc3dae257ecae6dc0
-  data.tar.gz: f863e68d23369100f01c3d818aaecad50205afff
+  metadata.gz: 7d9b73ef742e367384eeec735b980ad4ef809bf3
+  data.tar.gz: 3a2d1e5c49ccbb386c4bbe42b57cc031c6271010
 SHA512:
-  metadata.gz: 25abb01fe95848d99d5b20e3db8f00a03921377ea291fec3c4a938e1b73deb42650c068f2f3b1349e4dfc097515176f4d0bc8d87b096e8882076e3e187985a97
-  data.tar.gz: 3a1327e9286689eadfb6c6fc6725323dcb338eb7d9bc783e2dd8d80cf1998907346c764103777fbaad582ed38471dbc76c9cc860c9ec266247292fecd041eb97
+  metadata.gz: 0460b59b327c793efaddfe14f3109a4b34ff5346b48c0284ec9d55e5f66cdaf3e508472ac5e554ab13aff8af9716230c05f10dbac81b93a3aaaa977832ce08c7
+  data.tar.gz: 01606ac902c2c9da0ee2bc24c46ca83483ce1b67d55af4ab0bc84d111d551a4ff3d2daf3907970feb6510c5f3040061a5951ba842449f8f25c5f5c6b9e9d4a0f

data/lib/rbbt/util/concurrency/processes/worker.rb

@@ -85,7 +85,7 @@ class RbbtProcessQueue
               if current > memory_cap and not @asked
                 Log.medium "Worker #{@current} for #{Process.pid} asked to respawn -- initial: #{initial} - multiplier: #{multiplier} - cap: #{memory_cap} - current: #{current}"
                 RbbtSemaphore.synchronize(@callback_queue.write_sem) do
-                  Process.kill "USR1", @current
+                  Process.kill "USR1", @current if @current
                 end
                 @asked = true
               end

data/lib/rbbt/util/misc/inspect.rb

@@ -61,7 +61,9 @@ module Misc
     when (defined? AnnotatedArray and AnnotatedArray)
       "<A: #{fingerprint Annotated.purge(obj)} #{fingerprint obj.info}>"
     when (defined? TSV and TSV::Parser)
-      "<TSVStream:" + (obj.filename || "NOFILENAME") + "--" << Misc.fingerprint(obj.options) << ">"
+      filename = obj.filename
+      filename = "STDIN(#{rand})" if filename == '-'
+      "<TSVStream:" + (filename || "NOFILENAME") + "--" << Misc.fingerprint(obj.options) << ">"
     when IO
       (obj.respond_to?(:filename) and obj.filename ) ? "<IO:" + (obj.filename || obj.inspect + rand(100000)) + ">" : obj.inspect
     when File
@@ -106,7 +108,9 @@ module Misc
     when obj.respond_to?(:path)
       remove_long_items("File: " + obj.path)
     when TSV::Parser === obj
-      remove_long_items("TSV Stream: " + obj.filename + " -- " << Misc.fingerprint(obj.options))
+      filename = obj.filename
+      filename = "STDIN(rand-#{rand(10000000)})" if filename == '-'
+      remove_long_items("TSV Stream: " + filename + " -- " << Misc.fingerprint(obj.options))
     when TSV === obj
       remove_long_items((obj.all_fields || []) + obj.keys.sort)
     when (Array === obj and obj.length > ARRAY_MAX_LENGTH)

data/lib/rbbt/workflow/accessor.rb

@@ -402,6 +402,9 @@ class Step
     (IO === @result) or (not @saved_stream.nil?) or status == :streaming
   end
 
+  def noinfo?
+    status == :noinfo
+  end
 
   def running?
     pid = info[:pid]

data/lib/rbbt/workflow/step.rb

@@ -286,7 +286,7 @@ class Step
     status << "dirty" if done? && dirty?
     status << "not running" if ! done? && ! running? 
     status.unshift " " if status.any?
-    Log.medium "Cleaning step: #{path}#{status * " "}"
+    Log.high "Cleaning step: #{path}#{status * " "}"
     abort if ! done? && running?
     Step.clean(path)
     self

data/lib/rbbt/workflow/step/dependencies.rb

@@ -82,9 +82,9 @@ class Step
 
     if (status == 'error' && (job.recoverable_error? || job.dirty?)) ||
       job.aborted? ||
-      (job.done? && ! job.updated?)  || (job.error? && ! job.updated?)
-      (job.done? && job.dirty?)  || (job.error? && job.dirty?)
-      (! (job.status == :waiting || job.status == :noinfo || job.done? || job.error? || job.aborted?) && ! job.running?)
+      (job.done? && ! job.updated?)  || (job.error? && ! job.updated?) ||
+      (job.done? && job.dirty?)  || (job.error? && job.dirty?) ||
+      (!(job.noinfo? || job.done? || job.error? || job.aborted? || job.running?))
 
       job.clean 
     end

data/lib/rbbt/workflow/step/run.rb

@@ -25,6 +25,7 @@ class Step
       begin
         if Step === i
           step = true
+          i.produce unless i.done? || i.error? || i.started?
           if i.done?
             if (task.input_options[task.inputs[pos]] || {})[:stream]
               TSV.get_stream i
@@ -114,8 +115,8 @@ class Step
       end
     end
 
-    Log.low "Some newer files found: #{Misc.fingerprint outdated_time}" if outdated_time.any?
-    Log.low "Some outdated files found: #{Misc.fingerprint outdated_dep}" if outdated_dep.any?
+    Log.high "Some newer files found: #{Misc.fingerprint outdated_time}" if outdated_time.any?
+    Log.high "Some outdated files found: #{Misc.fingerprint outdated_dep}" if outdated_dep.any?
 
     outdated_time + outdated_dep
   end

data/share/workflow_config.ru

@@ -115,6 +115,21 @@ if etc_dir['target_workflow_exec_exports'].exists?
   end
 end
 
+app.get '/reload_workflow' do
+  if production?
+    halt 500, "Not allowed in production" 
+  end
+
+  workflow = params[:workflow] if params[:workflow]
+  wf_file = Workflow.local_workflow_filename(workflow)
+  wf_dir = File.dirname(wf_file)
+  $LOADED_FEATURES.delete_if do |path|
+    Misc.path_relative_to(wf_dir, path)
+  end
+  load wf_file
+  halt 200, "Workflow #{ workflow } reloaded"
+end
+
 #{{{ RUN
 require 'rack'
 use Rack::Deflater

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.122
+  version: 5.21.123
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake