projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in collections.provenance when a script_parameter is a Fixnum.
[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 17ca6cb9a60e7325aafea48a7bae6d6f6ed6783a..9c8f724120ba8049b4a498141e669c5708ca0317 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-35,6
+35,7
@@
class Job < ArvadosModel
t.add :tasks_summary
t.add :dependencies
t.add :log_stream_href
t.add :tasks_summary
t.add :dependencies
t.add :log_stream_href
+ t.add :log_buffer
end
def assert_finished
end
def assert_finished
@@
-57,6
+58,10
@@
class Job < ArvadosModel
protected
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
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
@@
-166,4
+171,14
@@
class Job < ArvadosModel
end
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
end