diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-07-20 20:29:25 -0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-07-21 10:31:49 -0300 |
commit | 79983afbbf052476eee3d86e0b970326e64f8514 (patch) | |
tree | 5c506e17b76ccc80f6de472ba3939c882ee956b4 /app/services/repository_archive_clean_up_service.rb | |
parent | 1bda45178977f613a9f4adc1d00e2694ca3963b5 (diff) | |
download | gitlab-ce-79983afbbf052476eee3d86e0b970326e64f8514.tar.gz |
Use find instead Ruby to remove files due to performance reasons
Diffstat (limited to 'app/services/repository_archive_clean_up_service.rb')
-rw-r--r-- | app/services/repository_archive_clean_up_service.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/app/services/repository_archive_clean_up_service.rb b/app/services/repository_archive_clean_up_service.rb index 9764df6492d..0b56b09738d 100644 --- a/app/services/repository_archive_clean_up_service.rb +++ b/app/services/repository_archive_clean_up_service.rb @@ -1,5 +1,4 @@ class RepositoryArchiveCleanUpService - ALLOWED_ARCHIVE_EXTENSIONS = %w[tar tar.bz2 tar.gz zip].join(',').freeze LAST_MODIFIED_TIME_IN_MINUTES = 120 def initialize(mmin = LAST_MODIFIED_TIME_IN_MINUTES) @@ -21,22 +20,14 @@ class RepositoryArchiveCleanUpService attr_reader :mmin, :path def clean_up_old_archives - Dir.glob("#{path}/**.git/*{#{ALLOWED_ARCHIVE_EXTENSIONS}}") do |filename| - File.delete(filename) if older?(filename) - end - end - - def older?(filename) - File.exist?(filename) && File.new(filename).mtime < (Time.now - mmin * 60) + run(%W(find #{path} -not -path #{path} -type f \( -name \*.tar -o -name \*.bz2 -o -name \*.tar.gz -o -name \*.zip \) -maxdepth 2 -mmin +#{mmin} -delete)) end def clean_up_empty_directories - Dir.glob("#{path}/**.git/").reverse_each do |dir| - Dir.rmdir(dir) if empty?(dir) - end + run(%W(find #{path} -not -path #{path} -type d -empty -name \*.git -maxdepth 1 -delete)) end - def empty?(dir) - (Dir.entries(dir) - %w[. ..]).empty? + def run(cmd) + Gitlab::Popen.popen(cmd) end end |