summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-28 17:16:37 +0000
committerStan Hu <stanhu@gmail.com>2016-07-28 17:16:37 +0000
commit15654eca7f7db7176281ce4fd23504b09bd930a4 (patch)
treeb3ea30fa4c032c2e0526ddbb1bb8543685042c17
parent4a2320a7b002ca97a238d020ede44db1bac2ffd1 (diff)
parent230f6910135f4449b5b5e83867922bf2580ba655 (diff)
downloadgitlab-ce-15654eca7f7db7176281ce4fd23504b09bd930a4.tar.gz
Merge branch 'log-project-deletion' into 'master'
Add a log message when a project is scheduled for destruction for debugging We have a lot of projects that are in `pending_delete` state. It's not clear whether they were ever scheduled for destruction, or whether Sidekiq just dropped the job due to `MemoryKiller` or some other reason. Also this will provide a record of which user destroys a project. #20365 See merge request !5540
-rw-r--r--app/models/project.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e2bf5f3a3fb..dc44a757b4b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1164,7 +1164,10 @@ class Project < ActiveRecord::Base
def schedule_delete!(user_id, params)
# Queue this task for after the commit, so once we mark pending_delete it will run
- run_after_commit { ProjectDestroyWorker.perform_async(id, user_id, params) }
+ run_after_commit do
+ job_id = ProjectDestroyWorker.perform_async(id, user_id, params)
+ Rails.logger.info("User #{user_id} scheduled destruction of project #{path_with_namespace} with job ID #{job_id}")
+ end
update_attribute(:pending_delete, true)
end