X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/75fc4c166f319cddd5b20af95a14a433274e956f..7024cc159936593350aaf7939d700102f6510787:/services/api/app/controllers/arvados/v1/jobs_controller.rb?ds=sidebyside

diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 2b64278fc6..6c45f88e61 100644
--- 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]
@@ -40,6 +41,11 @@ class Arvados::V1::JobsController < ApplicationController
     super
   end
 
+  def cancel
+    @object.update_attributes cancelled_at: Time.now
+    show
+  end
+
   class LogStreamer
     Q_UPDATE_INTERVAL = 12
     def initialize(job, opts={})
@@ -111,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
@@ -121,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: {