rbbt-rest 1.8.12 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ec6a4d18a8f038d1dcde6def73cef597cfd233
-  data.tar.gz: 7300356f3b3d2dcfcb3fd0aed05e808942ae9fce
+  metadata.gz: b04163cbc85792c0d0051c0db5a1d0fe660cccab
+  data.tar.gz: 1dbc02c47f8557a8cdc5344fda9cb1fd638591ea
 SHA512:
-  metadata.gz: 750cc3ac0961111b9fc2526f7ae7e51d9b84801074e41fd29582efcda8685b7cc0f8cd3f519ee1fd180080984962873a98d3f536ed58f280e6089d8b1655bb8f
-  data.tar.gz: b6f74f3669ce861c26c105b4f02a66a48b93b6a878e1a60292cefb87132266bdb7307ba00c05e11ced05767db8f2c9afa13803f82d9bad83b767677f44bd7b6a
+  metadata.gz: 2e4d467e0a73c5b785ffc323b82623ffaa483b8ac816caeaac349ff38b12098be3714952da97507d7a6ae3d107a5eafc82336e83baba21ddeb3ff1849f7a08da
+  data.tar.gz: e6d983292f0703baddc62e5279fea29f0077c49d2e485d056dce53769d2583980cf995cde5557f5355b8434d06156b559006cee5a22b6721fcbce65e38e21d3e

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

@@ -155,6 +155,8 @@ module WorkflowRESTHelpers
       job.soft_grace
     end
 
+    raise job.messages.last if job.error?
+
     s = TSV.get_stream job
 
     sout, sin = Misc.pipe

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

@@ -83,9 +83,14 @@ class StreamWorkflowTask
     Misc.add_stream_filename(stream, filename) if filename
 
     clean_stream = Misc.open_pipe do |sin|
-      copy_until_boundary(stream, sin, boundary)
+      begin
+        copy_until_boundary(stream, sin, boundary)
+      rescue
+      end
     end
 
+    ConcurrentStream.setup(clean_stream, :filename => filename)
+
     task_parameters[stream_input] = clean_stream
 
     task = task.to_sym
@@ -196,14 +201,20 @@ class StreamWorkflowTask
 
   def do_stream(env)
     uri = env["REQUEST_URI"]
+
     post = env["REQUEST_METHOD"]
+    return false unless post == "POST"
+
     hijack = !!env["rack.hijack"]
+    return false unless hijack
+
     content_type = env["CONTENT_TYPE"] 
+    return false unless content_type and content_type.include? "Rbbt_Param_Stream"
+
     encoding = env["HTTP_TRANSFER_ENCODING"] 
-    id = env["HTTP_RBBT_ID"] 
-    id = id + ": " + Thread.current.object_id.to_s if id
+    return false unless encoding == "chunked"
 
-    post == "POST" and hijack and content_type and content_type.include? "Rbbt_Param_Stream" and encoding == 'chunked'
+    true
   end
 
   def call(env)
@@ -214,12 +225,13 @@ class StreamWorkflowTask
         client = env["rack.hijack"]
         buffer = client.instance_variable_get('@buffer')
         tcp_io = client.call
-        Log.low "YES Hijacking post data #{tcp_io}"
+        Log.low "Hijacking post data #{tcp_io}"
 
         content_type = env["CONTENT_TYPE"]
 
         tcp_merged_io = Misc.open_pipe do |sin| merge_chunks(tcp_io, sin, buffer) end
 
+
         inputs, stream_input, filename, stream, boundary = get_inputs(content_type, tcp_merged_io)
 
         workflow, task = parse_uri(env)
@@ -228,6 +240,9 @@ class StreamWorkflowTask
 
         job_url = File.join("/", workflow.to_s, task, job.name)
 
+        raise "Job aborted" if job.aborted?
+        raise job.messages.last if job.error?
+
         out_stream = TSV.get_stream job
 
         begin
@@ -256,7 +271,7 @@ class StreamWorkflowTask
         raise $!
       end
     else
-      Log.high "NOT Hijacking post data"
+      Log.low "NOT Hijacking post data"
 
       @app.call(env)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.12
+  version: 1.8.13
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake