Merge branch 'master' into 3198-writable-fuse

[arvados.git] / apps / workbench / app / helpers / jobs_helper.rb

diff --git a/apps/workbench/app/helpers/jobs_helper.rb b/apps/workbench/app/helpers/jobs_helper.rb
index aca0999e8534e52631e720b70e9cc76c68a84b7f..889dd23823b2c1050bc2f05ec2d69cc95900984c 100644 (file)
--- a/apps/workbench/app/helpers/jobs_helper.rb
+++ b/apps/workbench/app/helpers/jobs_helper.rb
@@ -1,10 +1,11 @@
 module JobsHelper
-  def stderr_log_history(job_uuids)
+  def stderr_log_history(job_uuids, limit=2000)
     results = []
 
-    log_history = stderr_log_records(job_uuids)
-    if !log_history.empty?
-      reversed_results = log_history.reverse
+    log_history = Log.where(event_type: 'stderr',
+                            object_uuid: job_uuids).limit(limit).order('id DESC')
+    if !log_history.results.empty?
+      reversed_results = log_history.results.reverse
       reversed_results.each do |entry|
         if entry.andand.properties
           properties = entry.properties
@@ -18,20 +19,4 @@ module JobsHelper
     return results
   end
 
-  def stderr_log_records(job_uuids, extra_filters = nil)
-    filters = [["event_type",  "=", "stderr"],
-               ["object_uuid", "in", job_uuids]]
-    filters += extra_filters if extra_filters
-    last_entry = Log.order('id DESC').limit(1).filter(filters).results.first
-    if last_entry
-      filters += [["event_at", ">=", last_entry.event_at - 5.minutes]]
-      Log.order('id DESC')
-         .limit(250)
-         .filter(filters)
-         .results
-    else
-      []
-    end
-  end
-
 end