rbbt-util 5.24.3 → 5.24.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc724315cf570c49c12aed817fc7996bb01c2c14
-  data.tar.gz: 9ed853ef0afa511e95ccf195e3b4407274fda1cd
+  metadata.gz: dee6dfbe9d1a772c397240379672725fa87d00e6
+  data.tar.gz: 3dc029798e1c7c5bca86efff35790fc5466205b0
 SHA512:
-  metadata.gz: 36ac51895692f1d69f5d402e6bef9ff57e52118793f9f3b43115c58a28755d073a4f84b0910600b59504acdce29becc6fbccfbed8f19dfabaf4e6f04da44f102
-  data.tar.gz: daa26aa5e764a10dc3a6b770e7f9d61143173fbf4c65d946dc129a3e040d1b038a8e555902edd61560b6b0bee2a5544a141fbb5c3a80e47b7a0ecd91ab44d94e
+  metadata.gz: 8f245d1e98280306381c5b9aa4e0f7d17641051bb70efe3ce1e49305fe23bdfe60ca33a359aff2952e6eff0d8c69dcb8b8d70ef5d72f845c69dc7980136b97d8
+  data.tar.gz: 929cfce01b2fa8b16df94b8ee963f6d16bf008fa5405a7d83c19ec3b4d14193984e4db4611ffc755b211ff7368cf410526b83ac78d0d143c7f71d8c2818bc569

data/etc/app.d/semaphores.rb

@@ -0,0 +1,8 @@
+$rest_cache_semaphore = "/REST_SEMAPHORE"
+parallel_rest_jobs = Rbbt::Config.get('parallel_rest_jobs', :parallel_rest_jobs, :rest_jobs, :default => 2)
+begin
+  RbbtSemaphore.delete_semaphore($rest_cache_semaphore)
+ensure
+  RbbtSemaphore.create_semaphore($rest_cache_semaphore, parallel_rest_jobs)
+end
+Log.debug("Created semaphore: #{$rest_cache_semaphore} with #{parallel_rest_jobs} size")

data/lib/rbbt/util/config.rb

@@ -79,6 +79,9 @@ module Rbbt::Config
   end
 
   def self.get(key, *tokens)
+    options = tokens.pop if Hash === tokens.last
+    default = options.nil? ? nil : options[:default]
+
     tokens = tokens.flatten
     file, _sep, line = caller.reject{|l| 
       l =~ /rbbt\/(?:resource\.rb|workflow\.rb)/ or
@@ -104,7 +107,7 @@ module Rbbt::Config
       end
     end
 
-    value = priorities.empty? ? nil : priorities.sort_by{|p,v| p}.first.last.first
+    value = priorities.empty? ? default : priorities.sort_by{|p,v| p}.first.last.first
     value = false if value == 'false'
     Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"
     value

data/lib/rbbt/workflow/accessor.rb

@@ -564,7 +564,7 @@ class Step
 
   def config(key, *tokens)
     options = tokens.pop if Hash === tokens.last
-    default = options[:default] if options
+    options ||= {}
 
     new_tokens = []
     if workflow
@@ -574,9 +574,7 @@ class Step
     end
     new_tokens << ("task:" << task_name.to_s)
 
-    value = Rbbt::Config.get(key, tokens + new_tokens)
-
-    value || default
+    Rbbt::Config.get(key, tokens + new_tokens, options)
   end
 
   def access

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

@@ -479,8 +479,13 @@ class Step
       sout.close if sout
       Misc.pre_fork
       begin
-        RbbtSemaphore.wait_semaphore(semaphore) if semaphore
         Open.mkdir File.dirname(path) unless Open.exist?(File.dirname(path))
+        Open.write(pid_file, Process.pid.to_s) unless Open.exists?(path) or Open.exists?(pid_file)
+        if semaphore
+          init_info
+          log :queue, "Queued over semaphore: #{semaphore}"
+          RbbtSemaphore.wait_semaphore(semaphore) 
+        end
         begin
           @forked = true
           res = run no_load

data/lib/rbbt/workflow/step.rb

@@ -261,7 +261,6 @@ class Step
     else
       children_pids << child_pid
     end
-    #Process.detach(child_pid)
     set_info :children_pids, children_pids
     child_pid
   end

data/share/config.ru

@@ -67,6 +67,9 @@ load_file Rbbt.etc['app.d/post.rb'].find_all
 #{{{ PRELOAD
 load_file Rbbt.etc['app.d/preload.rb'].find_all
 
+#{{{ PRELOAD
+load_file Rbbt.etc['app.d/semaphores.rb'].find_all
+
 #{{{ SINATRA
 load_file Rbbt.lib['sinatra.rb'].find_all
 
@@ -82,4 +85,3 @@ $title = app_name
 require 'rack'
 use Rack::Deflater
 run app
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.24.3
+  version: 5.24.4
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -194,6 +194,7 @@ files:
 - etc/app.d/remote_workflow_tasks.rb
 - etc/app.d/requires.rb
 - etc/app.d/resources.rb
+- etc/app.d/semaphores.rb
 - etc/app.d/workflows.rb
 - lib/rbbt-util.rb
 - lib/rbbt.rb