rbbt-util 5.25.5 → 5.25.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e07b6ec4cc5c33daa9aa1ab26b968c7dd42b1c7d
-  data.tar.gz: 7a2cbbba275dac3f7981ce794468880faac8e306
+  metadata.gz: 6c41dd2cc666f027f12f3f06c3f4bd7752f79622
+  data.tar.gz: a58c81c37d6ac31ecdac5b1a4d43979ef6ac6d5e
 SHA512:
-  metadata.gz: 9a185e9f04e0be73b6d71b8d8358f4cd6c36669c7c93439e1e75876366a14b3aaf392f22be4fa0d19d363fd1256365d5e5258305e3fb9f3d1506aba862e7afc6
-  data.tar.gz: 02c0a3c7457da08b7445cfde0ef3e5799b69078a26a59b69f913b7c0f631647cf02e0cbb07ef821d82d193de0fd44a6a31dadda6ccbc3871e524183b78282fb3
+  metadata.gz: 5ca7a1b01d8b1d446eda5835d5fd9a1b1a4566385f0f47b50609d3cad1eec934a2faf834aa1da47ff861d4986dd441952f3ab32dcb33614d17eaa66165377f78
+  data.tar.gz: f0fb32fb43d1e59e5e6152cde6831c3b63379317f6d82ad48851d82e7c34e561835766efc0794efff0b4d92135ceec1f661f73f09d037da59d090e8378c43247

data/lib/rbbt/persist.rb

@@ -351,16 +351,17 @@ module Persist
 
     persist_options ||= {}
     if type == :memory and persist_options[:file] and persist_options[:persist] 
+      repo = persist_options[:repo] || Persist::MEMORY
       if persist_options[:persist] == :update || persist_options[:update]
-        (persist_options[:repo] || Persist::MEMORY).delete persist_options[:file]
+        repo.delete persist_options[:file]
       end
-      return (persist_options[:repo] || Persist::MEMORY)[persist_options[:file]] ||= yield 
+      return repo[persist_options[:file]] ||= yield 
     end
 
     if FalseClass === persist_options[:persist]
       yield
     else
-      persist_options[:update] ||= true if persist_options[:persist].to_s == "update"
+      persist_options[:update] = true if persist_options[:persist].to_s == "update"
       other_options = Misc.process_options persist_options, :other
       path = persistence_path(name, persist_options, other_options || {})
 
@@ -375,6 +376,7 @@ module Persist
       when type.to_sym == :memory
         repo = persist_options[:repo] || Persist::MEMORY
         path = path.find if Path === path
+        repo.delete path if persist_options[:update]
         repo[path] ||= yield
 
       when (type.to_sym == :annotations and persist_options.include? :annotation_repo)
@@ -475,8 +477,9 @@ module Persist
       options = options.dup
       file = name
       repo = options.delete :repo if options and options.any?
+      update = options.delete :update if options and options.any?
       file << "_" << (options[:key] ? options[:key] : Misc.hash2md5(options)) if options and options.any?
-      persist name, :memory, {:repo => repo, :persist => true, :file => file}.merge(options), &block
+      persist name, :memory, {:repo => repo, :update => update, :persist => true, :file => file}.merge(options), &block
     end
   end
 end

data/lib/rbbt/rest/client/step.rb

@@ -128,7 +128,15 @@ class WorkflowRESTClient
 
     def info(check_lock=false)
       @done = @info && @info[:status] && @info[:status].to_sym == :done
-      @info = Persist.memory("RemoteSteps Info", :url => @url, :persist => true, :update => !@done) do
+
+      if !@done && (@last_info_time.nil? || (Time.now - @last_info_time) > 0.5)
+        update = true 
+      else
+        update = false
+      end
+
+      @info = Persist.memory("RemoteSteps Info", :url => @url, :persist => true, :update => update) do
+        @last_info_time = Time.now
         init_job unless @url
         info = WorkflowRESTClient.get_json(File.join(@url, 'info'))
         info = WorkflowRESTClient.fix_hash(info)
@@ -140,7 +148,7 @@ class WorkflowRESTClient
     def status
       return :done if @done
       return nil unless url or started?
-      return :streaming if @streaming
+      #return :streaming if @streaming 
       begin
         status = info[:status]
         @done = true if status and status.to_sym == :done
@@ -195,6 +203,8 @@ class WorkflowRESTClient
     def init_job(cache_type = nil, other_params = {})
       cache_type = :asynchronous if cache_type.nil? and not @is_exec
       cache_type = :exec if cache_type.nil?
+      @last_info_time = nil
+      @done = false
       get_streams
       @name ||= Persist.memory("RemoteSteps", :workflow => self, :task => task, :jobname => @name, :inputs => inputs, :cache_type => cache_type) do
         WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(other_params).merge(:jobname => @name||@base_name, :_cache_type => cache_type))

data/lib/rbbt/workflow/definition.rb

@@ -162,6 +162,7 @@ module Workflow
     end
 
     tasks.each do |task|
+      Log.high "Task #{task} from #{source.to_s} is already present in #{self.to_s} and will be cloacked" if self.tasks.include? task.to_sym
       self.tasks[task.to_sym] = source.tasks[task.to_sym] if source.tasks.include? task.to_sym
       self.task_dependencies[task.to_sym] = source.task_dependencies[task.to_sym] if source.tasks.include? task.to_sym
       self.task_description[task.to_sym] = source.task_description[task.to_sym] if source.tasks.include? task.to_sym

data/share/rbbt_commands/workflow/server

@@ -94,7 +94,7 @@ TmpFile.with_file do |app_dir|
       ENV["RBBT_WORKFLOW_TASK_STREAM"] = 'true'
     end
 
-    config_ru_file = File.exist?('./workflow_config.ru') ? './config.ru' : Rbbt.share['workflow_config.ru'].find
+    config_ru_file = File.exist?('./workflow_config.ru') ? './workflow_config.ru' : Rbbt.share['workflow_config.ru'].find
 
 
     if options[:options]

data/share/rbbt_commands/workflow/task

@@ -486,6 +486,7 @@ when (defined?(WorkflowRESTClient) and WorkflowRESTClient::RemoteStep)
     res.join if res.respond_to? :join
   elsif res.nil?
     job.join
+    raise job.get_exception if job.error? || job.aborted?
     puts Open.read(job.path, :nocache => true, :nofail => true)
   else
     if Array === res

data/share/workflow_config.ru

@@ -80,6 +80,9 @@ load_file etc_dir['app.d/post.rb'].find_all
 #{{{ PRELOAD
 load_file etc_dir['app.d/preload.rb'].find_all
 
+#{{{ PRELOAD
+load_file Rbbt.etc['app.d/semaphores.rb'].find_all
+
 if etc_dir['target_workflow_exports'].exists?
   exports = etc_dir['target_workflow_exports'].read.split("\n")
   exports.each do |task|

metadata

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