rbbt-rest 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27fb73d8f78ef62a68182c55e631b6d70c508d8e
-  data.tar.gz: a12b4c60cc6759a36de87af95783eb71362b98ca
+  metadata.gz: f37a8c9910018bf272558a676de7eec240f0af66
+  data.tar.gz: 5b0b9d2405a59d8c0f134de26368d73d2c0a677c
 SHA512:
-  metadata.gz: 197d4db15e3b84632e8370f578aada3f6930d3126cf623a55da1f4c6861009796ccfbe1da1e41f215c9d3fce2c1ee9546b78cf09802dd309da3ba5e79cd188ed
-  data.tar.gz: 8cebd8b14a008b30705dc15f2471668271cb5712ede4deec16687f18cce6bd0c9ca6c56838813906762ff75b111543e7c2507c114d0e4b2d255c170197d1afcc
+  metadata.gz: 5ba5ce4ffd9f48cba52301a48d5510455711b481709bbff517b58f4418ef2fe5ecf01ce6487c0a3acc49227b1e8cbc5284ee6fb213034e55f0a1695c726878d1
+  data.tar.gz: b9a3df738c931583e0fe7cf06e08c65d9915ddad0ca6649eef7d0f37616e53ae3ea7fe333bce8571086a67c5148fa5b08642add26979f0d2204d0cc5f59f2123

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

@@ -13,6 +13,7 @@ class WorkflowRESTClient
     end
     def initialize(base_url, task = nil, base_name = nil, inputs = nil, result_type = nil, result_description = nil, is_exec = false)
       @base_url, @task, @base_name, @inputs, @result_type, @result_description, @is_exec = base_url, task, base_name, inputs, result_type, result_description, is_exec
+      @mutex = Mutex.new
       RemoteStep.get_streams @inputs
     end
 
@@ -86,10 +87,13 @@ class WorkflowRESTClient
     def get
       params ||= {}
       params = params.merge(:_format => [:string, :boolean, :tsv, :annotations,:array].include?(result_type.to_sym) ? :raw : :json )
-      begin
-        WorkflowRESTClient.get_raw(url, params)
-      rescue => e
-        raise e.response
+      Misc.insist 3, rand(2) + 1 do
+        begin
+          WorkflowRESTClient.get_raw(url, params)
+        rescue
+          Log.exception $!
+          raise $!
+        end
       end
     end
 
@@ -118,10 +122,18 @@ class WorkflowRESTClient
     end
 
     def run(noload = false)
-      return exec_job if @is_exec
-      init_job(:synchronous) 
-      return self.load unless noload
-      self.load
+      @mutex.synchronize do
+        @result ||= begin
+                      if @is_exec
+                        exec_job 
+                      else
+                        init_job(:synchronous) 
+                        iii url
+                        self.load
+                      end
+                    end
+      end
+      noload ? path : @result
     end
 
     def exec(*args)
@@ -129,6 +141,7 @@ class WorkflowRESTClient
     end
 
     def join
+      return if self.done?
       self.load
       self
     end

data/lib/rbbt/rest/main.rb

@@ -7,6 +7,7 @@ require 'sinatra/base'
 require 'sinatra/cross_origin'
 require 'json'
 
+require 'rack/stream'
 module Sinatra
   module RbbtRESTMain
     def add_sass_load_path(path)
@@ -44,7 +45,15 @@ module Sinatra
         set :allow_headers, ['URI']
 
         before do
-          Log.info{ "#{request.request_method} #{request.ip}: " << request.path_info << ". Params: " << Misc.fingerprint(params) }
+          method = request.request_method
+          method_color = case method
+          when "GET"
+            :cyan
+          when "POST"
+            :yellow
+          end
+
+          Log.info{ "#{Log.color method_color, method} #{Log.color(:blue, request.ip)}: " << request.path_info.gsub('/', Log.color(:blue, "/")) << ". Params: " << Log.color(:blue, Misc.fingerprint(params))}
           process_common_parameters
 
           headers 'Access-Control-Allow-Origin' => '*'
@@ -55,7 +64,26 @@ module Sinatra
         end
 
         after do
-          Log.info{ "#{request.request_method} #{request.ip}: " << request.path_info << ". Status: " << response.status.to_s }
+          method = request.request_method
+          method_color = case method
+          when "GET"
+            :cyan
+          when "POST"
+            :green
+          end
+
+          status = response.status.to_s
+          case status.to_i
+          when 200
+            color = :green
+          when 202
+            color = :yellow
+          when 404,500
+            color = :red
+          else
+            color = nil
+          end
+          Log.info{ "#{Log.color method_color, method} #{Log.color :blue, request.ip}: " << request.path_info.gsub('/', Log.color(:blue, "/")) << ". Status: " << Log.color(color, status) }
 
           if profile
             result = RubyProf.stop
@@ -144,5 +172,6 @@ module Sinatra
       end
     end
   end
+  #use Rack::Stream
 end
 

data/lib/rbbt/rest/workflow.rb

@@ -146,6 +146,7 @@ module Sinatra
           done = job.done?
           error = job.error?
 
+          iii [:get, job.path, started, done, error]
           if done
             show_result job, workflow, task
           else

data/lib/rbbt/rest/workflow/jobs.rb

@@ -152,15 +152,25 @@ module WorkflowRESTHelpers
     job.recursive_clean if update == :recursive_clean
 
     execution_type = execution_type(workflow, task)
-    case execution_type
+    case execution_type.to_sym
     when :exec
       show_exec_result job.exec, workflow, task
     when :synchronous, :sync
-      job.clean if update == :reload
+      if update == :reload
+        job.abort
+        job.clean 
+      end
+
       begin
-        job.run unless File.exists? job.info_file
+        job.run unless Open.exists? job.info_file
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 
         job_url += "?_format=#{@format}" if @format
+        begin
+          Misc.insist [0.1, 0.2, 0.5, 1, 3] do
+            raise unless Open.exists? job.info_file
+          end
+        rescue
+        end
         halt 200, job.name if format == :jobname
         redirect job_url
       rescue
@@ -168,10 +178,15 @@ module WorkflowRESTHelpers
         halt 500, $!.message
       end
     when :asynchronous, :async, nil
-      job.clean if update == :reload
+      if update == :reload
+        job.abort
+        job.clean 
+      end
 
       begin
-        job.fork unless File.exists? job.info_file
+        iii :fork
+
+        job.fork 
 
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 
         job_url += "?_format=#{@format}" if @format

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake