Merge pull request #6508 from hennevogel/feature/project-log-entry-cl…

…eanup-job

Project log entry cleanup job

src/api/app/controllers/webui/projects/pulse_controller.rb

@@ -18,7 +18,7 @@ def update_pulse
         end
 
         pulse = @project.project_log_entries.where(datetime: range).order(datetime: :asc)
-        @builds = pulse.where(event_type: [:build_fail, :build_success])
+        @builds = pulse.where(event_type: [:build_fail, :build_success]).where(datetime: 24.hours.ago..Time.zone.now)
         @new_packages = pulse.where(event_type: :create_package)
         @deleted_packages = pulse.where(event_type: :delete_package)
         @branches = pulse.where(event_type: :branch_command)

src/api/app/jobs/cleanup_project_log_entries.rb

@@ -0,0 +1,7 @@
+class CleanupProjectLogEntries < ApplicationJob
+  queue_as :project_log_rotate
+
+  def perform
+    ProjectLogEntries.cleanup
+  end
+end

src/api/app/models/project_log_entry.rb

@@ -27,9 +27,8 @@ def self.create_from(payload, created_at, event_model_name)
     entry
   end
 
-  # Delete old entries
-  def self.clean_older_than(date)
-    where('datetime < ?', date).delete_all
+  def self.cleanup
+    where(event_type: [:build_fail, :build_success]).where('datetime < ?', Time.zone.yesterday).delete_all
   end
 
   # Human readable message, based in the event class

src/api/app/views/webui2/webui/projects/pulse/_pulse_list.html.haml

@@ -63,6 +63,8 @@
 
     %h5#pulse-builds
       Builds
+      %small
+        (in the last 24 hours)
     %hr
     %ul.list-unstyled
       - builds.each do |log_entry|

src/api/app/views/webui2/webui/projects/pulse/_pulse_list_builds.html.haml

@@ -9,7 +9,7 @@
   been
   = link_to('#pulse-builds') do
     = builds.values.sum
-    builds
+    builds in the last 24 hours
   of which
   %b.text-danger
     = builds['build_fail']

src/api/config/clock.rb

@@ -57,6 +57,10 @@ module Clockwork
     CleanupEvents.perform_later
   end
 
+  every(1.day, 'clean old project log entries', at: '02:30') do
+    CleanupProjectLogEntries.perform_later
+  end
+
   every(1.day, 'create cleanup requests', at: '06:00') do
     User.current = User.get_default_admin
     ProjectCreateAutoCleanupRequests.perform_later

src/api/test/models/project_log_entry_test.rb

@@ -46,10 +46,4 @@ class ProjectLogEntryTest < ActiveSupport::TestCase
     assert_nil entry.bs_request
     assert_equal({ 'repository' => '10.2', 'arch' => 'i586', 'rev' => '5' }, entry.additional_info)
   end
-
-  test '#clean_older_than' do
-    count = ProjectLogEntry.count
-    ProjectLogEntry.clean_older_than(Date.parse('2013-08-09'))
-    assert_equal count - 1, ProjectLogEntry.count
-  end
 end