rcarvalho-workless 1.0.2.13 → 1.0.2.14

data/lib/workless/scalers/base.rb

@@ -21,7 +21,7 @@ module Delayed
           Rails.cache.write("WORKLESS_NUM_WORKERS", num)
         end
         
-        def self.calculate_num_workers
+        def self.calculate_num_workers up=false
           num_jobs = self.jobs.count
           @@scale_info ||= {
             0 => 0,
@@ -29,7 +29,15 @@ module Delayed
             500 => 2,
             1000 => 3
           }
-          scale_key = @@scale_info.keys.reverse.select{|v| v <= num_jobs }.first
+          scale_key = nil
+          if up
+            scale_key = @@scale_info.keys.select{|v| v > num_jobs }.first
+            scale_key ||= @@scale_info.keys.last
+          else
+            scale_key = @@scale_info.keys.select{|v| v > num_jobs }.first
+            scale_key = 0 if num_jobs == 0 # special case
+          end
+          
           if scale_key.nil?
             return 0
           else

data/lib/workless/scalers/heroku.rb

@@ -10,20 +10,25 @@ module Delayed
 
         def self.up
           nw = self.calculate_num_workers
-          client.set_workers(ENV['APP_NAME'], nw) if nw
+          if nw
+            if self.num_workers_cache != nw
+              self.num_workers_cache = nw
+              client.set_workers(ENV['APP_NAME'], nw)
+            end
+          end
         rescue          
         end
 
         def self.down
           nw = self.calculate_num_workers
-          client.set_workers(ENV['APP_NAME'], nw) unless self.workers == 0 or self.jobs.count > 0
+          if nw
+            if self.num_workers_cache != nw
+              self.num_workers_cache = nw
+              client.set_workers(ENV['APP_NAME'], nw)
+            end
+          end          
         rescue
         end
-
-        def self.workers
-          client.info(ENV['APP_NAME'])[:workers].to_i
-        end
-
       end
 
     end

data/lib/workless/scalers/heroku_cedar.rb

@@ -29,11 +29,6 @@ module Delayed
           end          
         rescue
         end
-
-        def self.workers
-          self.num_workers_cache
-        end
-
       end
 
     end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 2
-  - 13
-  version: 1.0.2.13
+  - 14
+  version: 1.0.2.14
 platform: ruby
 authors: 
 - lostboy