Skip to content
Snippets Groups Projects
Commit c297099b authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Z.J. van de Weg
Browse files

Cleanup projects which failed to delete

parent 77a43827
No related branches found
No related tags found
No related merge requests found
class CleanupPendingDeleteWorker
include Sidekiq::Worker
sidekiq_options retry: false # this job auto-repeats via sidekiq-cron
def perform
admin = User.find_by(admin: true)
Project.unscoped.where(pending_delete: true).find_each do |project|
ProjectDestroyWorker.perform_async(project.id, admin.id)
end
end
end
Loading
Loading
@@ -2,7 +2,7 @@ class ProjectDestroyWorker
include Sidekiq::Worker
include DedicatedSidekiqQueue
 
def perform(project_id, user_id, params)
def perform(project_id, user_id, params = {})
begin
project = Project.unscoped.find(project_id)
rescue ActiveRecord::RecordNotFound
Loading
Loading
Loading
Loading
@@ -312,6 +312,10 @@ Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= Settingslogic.n
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *'
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker'
 
Settings.cron_jobs['cleanup_pending_delete_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['cleanup_pending_delete_worker']['cron'] = '25 */4 * * *'
Settings.cron_jobs['cleanup_pending_delete_worker']['job_class'] = 'CleanupPendingDeleteWorker'
#
# GitLab Shell
#
Loading
Loading
require 'spec_helper'
describe CleanupPendingDeleteWorker do
let(:project) { create(:empty_project, pending_delete: true) }
let(:admin) { create(:admin) }
subject { CleanupPendingDeleteWorker.new }
describe "#perform" do
it "queues projects for deletion" do
expect(ProjectDestroyWorker).to receive(:perform_async).with(project.id, admin.id)
subject.perform
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment