diff options
author | Robert Speicher <robert@gitlab.com> | 2018-06-08 21:32:37 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-06-08 21:32:37 +0000 |
commit | 059a32811736c6e1837a2ff66be0f37d14ba75af (patch) | |
tree | 5222500e9f774a9c7973d6405ac4bf1eacc23995 | |
parent | 27045ce58e63c9d70f61e78260c397e0ee144657 (diff) | |
parent | 20923257407d705fee0d5b3238f441402214f8cd (diff) | |
download | gitlab-ce-059a32811736c6e1837a2ff66be0f37d14ba75af.tar.gz |
Merge branch 'sh-log-destroy-attempt' into 'master'
Add more logging before a project is destroyed
See merge request gitlab-org/gitlab-ce!19602
-rw-r--r-- | app/services/projects/destroy_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index de0125ed0dd..02769e72229 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -135,6 +135,7 @@ module Projects raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.') end + log_destroy_event trash_repositories! # Rails attempts to load all related records into memory before @@ -148,6 +149,10 @@ module Projects end end + def log_destroy_event + log_info("Attempting to destroy #{project.full_path} (#{project.id})") + end + ## # This method makes sure that we correctly remove registry tags # for legacy image repository (when repository path equals project path). |