do not munge hash keys in client-provided request. fixes #1516

[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 572a2c18fc84dab8de0dbe79a260fa56a82f42a6..c330da512245a21f9166401428c2579713363038 100644 (file)
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -40,15 +40,49 @@ class Arvados::V1::JobsController < ApplicationController
     super
   end
 
+  class LogStreamer
+    def initialize(job)
+      @job = job
+    end
+    def each
+      if @job.finished_at
+        yield "#{@job.uuid} finished at #{@job.finished_at}\n"
+        return
+      end
+      @redis = Redis.new(:timeout => 0)
+      @redis.subscribe(@job.uuid) do |event|
+        event.message do |channel, msg|
+          if msg == "end"
+            @redis.unsubscribe @job.uuid
+          else
+            yield "#{msg}\n"
+          end
+        end
+      end
+    end
+  end
+
+  def log_tail_follow
+    if !@object.andand.uuid
+      return render_not_found
+    end
+    self.response.headers['Last-Modified'] = Time.now.ctime.to_s
+    self.response_body = LogStreamer.new @object
+  end
+
   def queue
     load_where_param
     @where.merge!({
                     started_at: nil,
-                    is_locked_by: nil,
+                    is_locked_by_uuid: nil,
                     cancelled_at: nil
                   })
     params[:order] ||= 'priority desc, created_at'
     find_objects_for_index
     index
   end
+
+  def self._queue_requires_parameters
+    self._index_requires_parameters
+  end
 end