Revert "fix[Op#53019]: Good Job ClearOldMergeRequestsJob"

This reverts commit a5eb528.
Eric-Guo · Mar 22, 2024 · 4a67f09 · 4a67f09
1 parent 868eaad
commit 4a67f09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/modules/gitlab_integration/app/workers/cron/clear_old_merge_requests_job.rb b/modules/gitlab_integration/app/workers/cron/clear_old_merge_requests_job.rb
@@ -30,9 +30,12 @@
 #++
 
 module Cron
-  class ClearOldMergeRequestsJob < ApplicationJob
+  class ClearOldMergeRequestsJob < CronJob
     priority_number :low
 
+    # runs at 1:25 nightly
+    self.cron_expression = "25 1 * * *"
+
     def perform
       GitlabMergeRequest.without_work_package
                        .find_each(&:destroy!)

diff --git a/modules/gitlab_integration/lib/open_project/gitlab_integration/engine.rb b/modules/gitlab_integration/lib/open_project/gitlab_integration/engine.rb
@@ -100,13 +100,9 @@ class Engine < ::Rails::Engine
       mount ::API::V3::GitlabIssues::GitlabIssuesByWorkPackageAPI
     end
 
-    add_cron_jobs do
-      {
-        "Cron::ClearOldMergeRequestsJob": {
-          cron: "25 1 * * *", # runs at 1:25 nightly
-          class: ::Cron::ClearOldMergeRequestsJob.name
-        }
-      }
+    config.to_prepare do
+      # Register the cron job to clean up old gitlab merge requests
+      ::Cron::CronJob.register! ::Cron::ClearOldMergeRequestsJob
     end
   end
 end