Merge branch 'master' into 2060-edit-tags-in-workbench

[arvados.git] / services / api / app / controllers / arvados / v1 / jobs_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 69943f3277cff93b4e2fdd78af7f5e3955257ea5..6c45f88e61b1915a955d1e2895c22234965e2657 100644 (file)
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -3,6 +3,7 @@ class Arvados::V1::JobsController < ApplicationController
   accept_attribute_as_json :runtime_constraints, Hash
   accept_attribute_as_json :tasks_summary, Hash
   skip_before_filter :find_object_by_uuid, :only => :queue
+  skip_before_filter :render_404_if_no_object, :only => :queue
 
   def index
     want_ancestor = @where[:script_version_descends_from]
@@ -116,7 +117,7 @@ class Arvados::V1::JobsController < ApplicationController
 
   def self._log_tail_follow_requires_parameters
     {
-      buffer_size: {type: 'integer', required: false}
+      buffer_size: {type: 'integer', required: false, default: 2**13}
     }
   end
   def log_tail_follow
@@ -126,7 +127,7 @@ class Arvados::V1::JobsController < ApplicationController
     if client_accepts_plain_text_stream
       self.response.headers['Last-Modified'] = Time.now.ctime.to_s
       self.response_body = LogStreamer.new @object, {
-        buffer_size: (params[:buffer_size] || 2**13)
+        buffer_size: (params[:buffer_size].to_i rescue 2**13)
       }
     else
       render json: {