From 79983afbbf052476eee3d86e0b970326e64f8514 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Wed, 20 Jul 2016 20:29:25 -0300 Subject: Use find instead Ruby to remove files due to performance reasons --- app/services/repository_archive_clean_up_service.rb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'app/services/repository_archive_clean_up_service.rb') 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 -- cgit v1.2.3