rcarvalho-workless 1.0.2.12 → 1.0.2.13

data/lib/workless/scalers/base.rb

@@ -6,7 +6,7 @@ module Delayed
   
       class Base
         def self.jobs
-          Delayed::Job.all(:conditions => { :failed_at => nil })
+          Delayed::Job.where(:failed_at => nil)
         end
 
         def self.scale_info= info
@@ -22,19 +22,18 @@ module Delayed
         end
         
         def self.calculate_num_workers
-          if num_workers.class == Fixnum
-            @@scale_info ||= {
-              0 => 1,
-              100 => 2,
-              500 => 3,
-              1000 => 4
-            }
-            scale_key = @@scale_info.keys.reverse.select{|v| v < num_workers }.first
-            if scale_key.nil?
-              return 0
-            else
-              return @@scale_info[scale_key]
-            end
+          num_jobs = self.jobs.count
+          @@scale_info ||= {
+            0 => 0,
+            100 => 1,
+            500 => 2,
+            1000 => 3
+          }
+          scale_key = @@scale_info.keys.reverse.select{|v| v <= num_jobs }.first
+          if scale_key.nil?
+            return 0
+          else
+            return @@scale_info[scale_key]
           end
         end
       end

metadata

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