Merge branch 'staging'

ontohub · Nov 2, 2015 · c1d0ca2 · c1d0ca2
2 parents c29a180 + 6f2fa4d
commit c1d0ca2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/god/app.rb b/config/god/app.rb
@@ -16,6 +16,9 @@
       watch 'hets', 1
     end
 
+    # one worker for hets load balancing
+    watch 'hets_load_balancing', 1
+
     # one worker for the default queue
     watch 'default', 5
 
@@ -25,7 +28,7 @@
     watch 'priority_push', 1
   else
     # one worker for all queues
-    watch %w(hets default sequential priority_push), 1
+    watch %w(hets hets_load_balancing default sequential priority_push), 1
   end
 end
 

diff --git a/lib/hets_instance_force_free_worker.rb b/lib/hets_instance_force_free_worker.rb
@@ -1,5 +1,5 @@
 class HetsInstanceForceFreeWorker < BaseWorker
-  sidekiq_options queue: 'default'
+  sidekiq_options queue: 'hets_load_balancing'
 
   def perform(hets_instance_id)
     Semaphore.exclusively(HetsInstance::MUTEX_KEY) do