heroku-resque-workers-scaler 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8dc50d2ecf4710e742e167c733230ed00e3bcae
-  data.tar.gz: 7556b47f8cf4039e8a864b86397bd46e0690b20b
+  metadata.gz: 80444234023d5416075b0d6d274537223ec8b57b
+  data.tar.gz: f844a65e4d590cd1bdc7485981a97eb1f148b845
 SHA512:
-  metadata.gz: c1e449b8d91ae50b69d2e839b84535fe4bdde196196277b873ffe409a6e3e7361e9cb343c947b7c6f9e486d180b97d4c85ea45201cec93eb733f0e51d2d922fd
-  data.tar.gz: fca194c6dd9d4b8dc1e57c717602c06f4c7f179a73c1589dca8fd643c6a4e6916cab266e97696f54428a7608061d34c7829058fbf8f303dacdd68b0706a5503e
+  metadata.gz: 0278d725ae5a814419f546978d3633957c51bf8e2547c6e43141338225abaa518ff7933d465073cd71c779988c4c4ee3707041f1b39efd49fb90160be38d180c
+  data.tar.gz: d37a1fb67d184dcdc10c5c38b70163e830715bc73b08a66dd45fd69b0fb0f5677a555bfe22bdd8f5c92b0a1b9f12c9562b0f5d3ca038af2282fa08eea4c1916d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Changelog  VERSION = '0.3.0'
+* feature 
+  * Add another mode for thresholds
+  
+* bug fix
+  * fix size of working job count at ZERO instead of one
+
+[Fullcahnges](https://github.com/joel/heroku-resque-workers-scaler/pull/8)
+
 # Changelog  VERSION = '0.2.1'
 
 [Fullcahnges](https://github.com/joel/heroku-resque-workers-scaler/pull/7)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-resque-workers-scaler (0.2.1)
+    heroku-resque-workers-scaler (0.3.0)
       platform-api (~> 0.2.0)
       resque (~> 1.25.2)
 

data/README.md

@@ -26,7 +26,7 @@ You need to defined two vars for your heroku :
 ```
 heroku config:add HEROKU_API_KEY=your_api_key -a your_app_name
 heroku config:add HEROKU_APP_NAME=your_app_name -a your_app_name
-heroku config:add export SAFE_MODE=true -a your_app_name
+heroku config:add SAFE_MODE=true -a your_app_name
 ```
 
 ## Run localy
@@ -58,6 +58,7 @@ You can change the thresholds, environments of execution and the name of your wo
 
 Exmple YAML file contents:
 
+    mode: :thresholds # :fit, :half, :third
     thresholds:
     - :workers: 1
       :job_count: 1
@@ -67,6 +68,8 @@ Exmple YAML file contents:
       - production
     worker_name: resque
 
+if you use `mode: :fit` the number of job is exactly the same of available worker, `:half` the number of worker is 1/2 of number of job in queue, and for `third` 1/3
+
 I just bundled it into a gem for easy inclusion into other projects.
 
 #### Usage

data/config/scaler_config.yml

@@ -1,3 +1,4 @@
+mode: :thresholds # :fit, :half, :third
 thresholds:
 - :workers: 1
   :job_count: 1

data/lib/heroku-resque-workers-scaler.rb

@@ -1,3 +1,8 @@
 require 'heroku-resque-workers-scaler/version'
 require 'heroku-resque-workers-scaler/scaler'
-require 'heroku-resque-workers-scaler/config'
+require 'heroku-resque-workers-scaler/config'
+
+begin
+  require 'pry'
+rescue LoadError
+end

data/lib/heroku-resque-workers-scaler/config.rb

@@ -5,6 +5,10 @@ module HerokuResqueAutoScale
     extend self
 
     CONFIG_FILE_NAME = 'scaler_config.yml'
+    
+    def mode
+      @mode ||= config['mode']
+    end
 
     def thresholds
       @thresholds ||= config['thresholds']

data/lib/heroku-resque-workers-scaler/scaler.rb

@@ -54,7 +54,7 @@ module HerokuResqueAutoScale
       private
 
       def authorized?
-        HerokuResqueAutoScale::Config.environments.include? _environment
+        Config.environments.include? _environment
       end
 
       def _environment
@@ -66,7 +66,7 @@ module HerokuResqueAutoScale
       end
 
       def worker_name
-        HerokuResqueAutoScale::Config.worker_name
+        Config.worker_name
       end
 
     end
@@ -81,18 +81,27 @@ module HerokuResqueAutoScale
   end
 
   def after_enqueue_scale_up(*args)
-    HerokuResqueAutoScale::Config.thresholds.reverse_each do |scale_info|
-      # Run backwards so it gets set to the highest value first
-      # Otherwise if there were 70 jobs, it would get set to 1, then 2, then 3, etc
-
-      # If we have a job count greater than or equal to the job limit for this scale info
-      if Scaler.job_count >= scale_info[:job_count]
-        # Set the number of workers unless they are already set to a level we want. Don't scale down here!
-        if Scaler.workers <= scale_info[:workers]
-          Scaler.workers = scale_info[:workers]
+    case Config.mode
+    when :thresholds
+      Config.thresholds.reverse_each do |scale_info|
+        # Run backwards so it gets set to the highest value first
+        # Otherwise if there were 70 jobs, it would get set to 1, then 2, then 3, etc
+
+        # If we have a job count greater than or equal to the job limit for this scale info
+        if Scaler.job_count >= scale_info[:job_count]
+          # Set the number of workers unless they are already set to a level we want. Don't scale down here!
+          if Scaler.workers <= scale_info[:workers]
+            Scaler.workers = scale_info[:workers]
+          end
+          break # We've set or ensured that the worker count is high enough
         end
-        break # We've set or ensured that the worker count is high enough
       end
+    when :fit
+      Scaler.workers = Scaler.job_count
+    when :half
+      Scaler.workers = (Scaler.job_count/2)
+    when :third
+      Scaler.workers = (Scaler.job_count/3)
     end
   end
 
@@ -101,6 +110,6 @@ module HerokuResqueAutoScale
   def scale_down
     # Nothing fancy, just shut everything down if we have no pending jobs
     # and one working job (which is this job)
-    Scaler.workers = 0 if Scaler.job_count.zero? && Scaler.working_job_count == 1
+    Scaler.workers = 0 if Scaler.job_count.zero? && Scaler.working_job_count.zero?
   end
 end

data/lib/heroku-resque-workers-scaler/version.rb

@@ -1,3 +1,3 @@
 module HerokuResqueAutoScale
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-resque-workers-scaler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Quezada