From 44e4f07037ed192f9f86b575042164a3a106e4cb Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 19 Feb 2016 14:18:57 +0100 Subject: Improve readability of 'rake cache:clear' code --- lib/tasks/cache.rake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/tasks') diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake index b262ea898d5..9e2fb429d57 100644 --- a/lib/tasks/cache.rake +++ b/lib/tasks/cache.rake @@ -1,22 +1,21 @@ namespace :cache do - CLEAR_BATCH_SIZE = 1000 + CLEAR_BATCH_SIZE = 1000 # The more the faster, but having too many can crash Ruby REDIS_SCAN_START_STOP = '0' # Magic value, see http://redis.io/commands/scan desc "GitLab | Clear redis cache" task :clear => :environment do redis_store = Rails.cache.instance_variable_get(:@data) - cursor = [REDIS_SCAN_START_STOP, []] + cursor = REDIS_SCAN_START_STOP loop do - cursor = redis_store.scan( - cursor.first, + cursor, keys = redis_store.scan( + cursor, match: "#{Gitlab::REDIS_CACHE_NAMESPACE}*", count: CLEAR_BATCH_SIZE ) - keys = cursor.last redis_store.del(*keys) if keys.any? - break if cursor.first == REDIS_SCAN_START_STOP + break if cursor == REDIS_SCAN_START_STOP end end end -- cgit v1.2.1