Fix up start/end dates and display them in a more friendly way.

[arvados.git] / services / api / app / models / job.rb

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 5ea0cd471d45e3441e28dc02a2b990d72eced165..9c8f724120ba8049b4a498141e669c5708ca0317 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -58,6 +58,10 @@ class Job < ArvadosModel
 
   protected
 
+  def foreign_key_attributes
+    super + %w(output log)
+  end
+
   def ensure_script_version_is_commit
     if self.is_locked_by_uuid and self.started_at
       # Apparently client has already decided to go for it. This is
@@ -168,9 +172,13 @@ class Job < ArvadosModel
   end
 
   def log_buffer
-    @@redis ||= Redis.new(:timeout => 0)
-    if @@redis.exists uuid
-      @@redis.getrange(uuid, 0 - 2**10, -1)
+    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