rbbt-rest 1.8.15 → 1.8.16

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 67bbf64997041ff23492adbf15b83074f42a193a
4
- data.tar.gz: b8f500392db0679c9a38367e56eba2d9d82c9610
3
+ metadata.gz: 3925a1799d7cfb43aaef03e8afd5488cdde75f83
4
+ data.tar.gz: 9b822534f5f313b5c60b1e75d3e67df48384d95a
5
5
  SHA512:
6
- metadata.gz: 69fc67449424d8cc3d9dcc88f031ebcc8305ee2a8bf31ebd79b255783ebd62c1e05007da3cbb3d64f191b389c716fe8d11eeed2b9e54979b1b43da1c31f36ae1
7
- data.tar.gz: 9c26dd60d0f9d44a50dfa656c49912fda5731d42992960c1c6fd3e771333da96a229e7c9afc2cbbc4a0df08f4d8ba9bc076e7ca6aaa59e7b506758763cd17fd9
6
+ metadata.gz: c03edea3f5e962cc14c2ef466940deae11c91b2f1cdc7b2658208e13c8104d91ac21f94cadbbff0f38f1db0a02ff12acd63c21f8c471a0732b940937aad4ac6e
7
+ data.tar.gz: eb9c35081adf97c66fdea21f66231a5a14352eafc3dd4a03800c12d5d8e067eb2423c4f362751dd14b7fd031d3502cb3b9900233660d20c40210e4593c7ed35d
@@ -180,6 +180,8 @@ module RbbtRESTHelpers
180
180
  end
181
181
  io.filename = text[:filename]
182
182
  io
183
+ when text == "EMPTY_ARRAY"
184
+ []
183
185
  when text.nil?
184
186
  []
185
187
  else
@@ -79,6 +79,7 @@ class StreamWorkflowTask
79
79
  name = inputs.delete "jobname"
80
80
 
81
81
  task_parameters = prepare_job_inputs(workflow, task, inputs)
82
+ IndiferentHash.setup task_parameters
82
83
 
83
84
  Misc.add_stream_filename(stream, filename) if filename
84
85
 
@@ -91,11 +92,14 @@ class StreamWorkflowTask
91
92
 
92
93
  ConcurrentStream.setup(clean_stream, :filename => filename)
93
94
 
94
- task_parameters[stream_input] = clean_stream
95
+ task_parameters[stream_input.to_sym] = clean_stream
95
96
 
96
97
  task = task.to_sym
97
98
 
99
+ Log.low "Running streaming job #{[workflow, task] * "/" }: #{Misc.fingerprint task_parameters}"
98
100
  job = workflow.job(task, name, task_parameters)
101
+
102
+ job.clean if job.aborted?
99
103
 
100
104
  execution_type = case
101
105
  when workflow.exec_exports.include?(task)
@@ -231,7 +235,6 @@ class StreamWorkflowTask
231
235
 
232
236
  tcp_merged_io = Misc.open_pipe do |sin| merge_chunks(tcp_io, sin, buffer) end
233
237
 
234
-
235
238
  inputs, stream_input, filename, stream, boundary = get_inputs(content_type, tcp_merged_io)
236
239
 
237
240
  workflow, task = parse_uri(env)
@@ -246,14 +249,14 @@ class StreamWorkflowTask
246
249
  out_stream = TSV.get_stream job
247
250
 
248
251
  begin
249
- Log.low "Write response #{tcp_io} "
252
+ Log.low "Write response #{Misc.fingerprint tcp_io} "
250
253
  tcp_io.write "HTTP/1.1 200\r\n"
251
254
  tcp_io.write "Connection: close\r\n"
252
255
  tcp_io.write "RBBT-STREAMING-JOB-URL: #{ job_url }\r\n"
253
256
  tcp_io.write "\r\n"
254
- Log.low "Comsuming response #{tcp_io}"
257
+ Log.low "Comsuming response #{Misc.fingerprint tcp_io}"
255
258
  Misc.consume_stream(out_stream, false, tcp_io)
256
- Log.low "Comsumed response #{tcp_io}"
259
+ Log.low "Comsumed response #{Misc.fingerprint tcp_io}"
257
260
  rescue Exception
258
261
  Log.exception $!
259
262
  end if out_stream
@@ -264,10 +267,10 @@ class StreamWorkflowTask
264
267
  [-1, {}, []]
265
268
  rescue
266
269
  Log.exception $!
267
- io.write "HTTP/1.1 515\r\n"
268
- io.write "Connection: close\r\n"
269
- io.write "\r\n"
270
- io.close_write
270
+ tcp_io.write "HTTP/1.1 515\r\n"
271
+ tcp_io.write "Connection: close\r\n"
272
+ tcp_io.write "\r\n"
273
+ tcp_io.close_write
271
274
  raise $!
272
275
  end
273
276
  else
@@ -56,3 +56,8 @@ table > caption
56
56
  .filters + p
57
57
  margin-top: 2em
58
58
 
59
+ .link.button
60
+ padding: 0px
61
+ & > a
62
+ padding: 11px 21px
63
+ display: inline-block
@@ -33,7 +33,7 @@
33
33
  - inputs.each{ |k,v| v.replace Open.read(v) if String === v and File.exists? v }
34
34
  :javascript
35
35
  example_inputs["#{ name }"] = #{inputs.to_json}
36
- %li.ui.button
36
+ %li.ui.link.button
37
37
  %a.load_example(href="#" task=task name=name)= name
38
38
 
39
39
  :javascript
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-rest
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.15
4
+ version: 1.8.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-16 00:00:00.000000000 Z
11
+ date: 2016-06-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake