From 91e9acb49d35ee8294c2c4518a54e0274b7dd1c7 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 26 Jun 2015 23:30:58 +0000 Subject: [PATCH] more efficient queuer --- Gemfile.lock | 3 --- workers/archive_worker.rb | 14 +++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f519fdc1..be313793 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,6 +309,3 @@ DEPENDENCIES tilt webmock zipruby - -BUNDLED WITH - 1.10.2 diff --git a/workers/archive_worker.rb b/workers/archive_worker.rb index d7d0de15..51067e14 100644 --- a/workers/archive_worker.rb +++ b/workers/archive_worker.rb @@ -6,12 +6,20 @@ class ArchiveWorker def perform(site_id) site = Site[site_id] - return if site.nil? || site.is_banned? + return if site.nil? || site.is_banned? || site.is_deleted + + if site.site_files_dataset.count > 1000 + logger.info 'skipping #{site_id} (#{site.username}) due to > 1000 files' + return + end queue = Sidekiq::Queue.new self.class.sidekiq_options_hash['queue'] - + logger.info "JOB ID: #{jid} #{site_id.inspect}" queue.each do |job| - job.delete if job.args == [site_id] && job.jid != jid + if job.args == [site_id] && job.jid != jid + logger.info "DELETING #{job.jid} #{job.args.inspect}" + job.delete + end end site.archive!