From f81cf84035213002ce7931af6c3ffa917fe7fcbd Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 4 May 2017 12:13:33 +0200
Subject: refactor worker into service

---
 app/workers/propagate_project_service_worker.rb | 34 +++----------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'app/workers')

diff --git a/app/workers/propagate_project_service_worker.rb b/app/workers/propagate_project_service_worker.rb
index 53551770968..ab2b7738f9a 100644
--- a/app/workers/propagate_project_service_worker.rb
+++ b/app/workers/propagate_project_service_worker.rb
@@ -3,44 +3,18 @@ class PropagateProjectServiceWorker
   include Sidekiq::Worker
   include DedicatedSidekiqQueue
 
+  sidekiq_options retry: 3
+
   LEASE_TIMEOUT = 30.minutes.to_i
 
   def perform(template_id)
-    template = Service.find_by(id: template_id)
-
-    return unless template&.active
-    return unless try_obtain_lease_for(template.id)
-
-    Rails.logger.info("Propagating services for template #{template.id}")
+    return unless try_obtain_lease_for(template_id)
 
-    project_ids_for_template(template) do |project_id|
-      Service.build_from_template(project_id, template).save!
-    end
+    Projects::PropagateService.propagate!(Service.find_by(id: template_id))
   end
 
   private
 
-  def project_ids_for_template(template)
-    limit = 100
-    offset = 0
-
-    loop do
-      batch = project_ids_batch(limit, offset, template.type)
-
-      batch.each { |project_id| yield(project_id) }
-
-      break if batch.count < limit
-
-      offset += limit
-    end
-  end
-
-  def project_ids_batch(limit, offset, template_type)
-    Project.joins('LEFT JOIN services ON services.project_id = projects.id').
-      where('services.type != ? OR services.id IS NULL', template_type).
-      limit(limit).offset(offset).pluck(:id)
-  end
-
   def try_obtain_lease_for(template_id)
     Gitlab::ExclusiveLease.
       new("propagate_project_service_worker:#{template_id}", timeout: LEASE_TIMEOUT).
-- 
cgit v1.2.3