Merge remote-tracking branch 'origin/master' into 2882-job-process-stats

diff --combined services/api/app/models/job.rb
index dc3539891f30ad325ddb99db524b62f513538eb6,7bca409d0b664d13179152a577adbc26f4d656cd..51fb7c27832a21eec4193886e720d1c2c3363e23
--- 1/services/api/app/models/job.rb
--- 2/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -35,11 -35,8 +35,9 @@@ class Job < ArvadosMode
      t.add :runtime_constraints
      t.add :tasks_summary
      t.add :dependencies
-     t.add :log_stream_href
-     t.add :log_buffer
      t.add :nondeterministic
      t.add :repository
 +    t.add :supplied_script_version
    end
  
    def assert_finished
@@@ -48,12 -45,6 +46,6 @@@
                        running: false)
    end
  
-   def log_stream_href
-     unless self.finished_at
-       "#{current_api_base}/#{self.class.to_s.pluralize.underscore}/#{self.uuid}/log_tail_follow"
-     end
-   end
- 
    def self.queue
      self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ? and success is ?',
                 nil, nil, nil, nil).
@@@ -89,7 -80,6 +81,7 @@@
      if new_record? or script_version_changed?
        sha1 = Commit.find_commit_range(current_user, self.repository, nil, self.script_version, nil)[0] rescue nil
        if sha1
 +        self.supplied_script_version = self.script_version if self.supplied_script_version.nil? or self.supplied_script_version.empty?
          self.script_version = sha1
        else
          raise ArgumentError.new("Specified script_version does not resolve to a commit")
@@@ -189,15 -179,4 +181,4 @@@
        end
      end
    end
- 
-   def log_buffer
-     begin
-       @@redis ||= Redis.new(:timeout => 0)
-       if @@redis.exists uuid
-         @@redis.getrange(uuid, 0 - 2**10, -1)
-       end
-     rescue Redis::CannotConnectError
-       return '(not available)'
-     end
-   end
  end