middle_management 1.0.2 → 1.0.3

data/lib/middle_management/manager.rb

@@ -4,14 +4,15 @@ require 'delayed/backend/active_record'
 
 module MiddleManagement
   class Manager
-    def self.enforce_number_of_current_jobs(_num_workers_last_set_at = nil, _current_worker_count = nil, _last_enforcement_job_set_for = nil)
+    # ToDo: Figure out what to do about caching worker counts
+    def self.enforce_number_of_current_jobs(_num_workers_last_set_at = nil, _last_enforcement_job_set_for = nil)
+      self.current_worker_count = self.get_heroku_client.info[:workers]
       # Do nothing if our worker figures are up-to-date
       return if !self.num_jobs_changes_worker_count?(self.current_jobs_count)
       
       # Load cached values if they're supplied. This is to prevent different instances
       # from re-querying the heroku API.
       self.num_workers_last_set_at = _num_workers_last_set_at unless _num_workers_last_set_at.nil?
-      self.current_worker_count = _current_worker_count unless _current_worker_count.nil?
       self.last_enforcement_job_set_for = _last_enforcement_job_set_for unless _last_enforcement_job_set_for.nil?
       
       # Set number of workers if we haven't set it recently
@@ -22,7 +23,7 @@ module MiddleManagement
         # Schedule job with cached data if we don't have one scheduled
         if self.last_enforcement_job_set_for.nil? || Time.now > self.last_enforcement_job_set_for # Prevent multiple jobs within our window
           self.last_enforcement_job_set_for = Time.now + 10.seconds
-          self.delay(:run_at => self.last_enforcement_job_set_for).enforce_number_of_current_jobs(self.num_workers_last_set_at, self.current_worker_count, self.last_enforcement_job_set_for)
+          self.delay(:run_at => self.last_enforcement_job_set_for).enforce_number_of_current_jobs(self.num_workers_last_set_at, self.last_enforcement_job_set_for)
           # Make sure we have at least one worker running to cover the job.
           self.set_num_workers(1) if self.current_worker_count == 0
         end
@@ -73,8 +74,8 @@ module MiddleManagement
     end
     
     def self.set_num_workers(num_workers)
-      self.get_heroku_client.set_workers(MiddleManagement::Config::HEROKU_APP, num_workers)
       self.current_worker_count = num_workers
+      self.get_heroku_client.set_workers(MiddleManagement::Config::HEROKU_APP, num_workers)
     end
   end
 end

data/lib/middle_management/version.rb

@@ -1,3 +1,3 @@
 module MiddleManagement
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/lib/middle_management/manager_spec.rb

@@ -24,7 +24,9 @@ describe MiddleManagement::Manager do
       stub_config(:HEROKU_APP, "test_app")
       stub_config(:MIN_WORKERS, 1)
       stub_config(:MAX_WORKERS, 10)
+      stub_config(:JOBS_PER_WORKER, 1)
       @client_mock = mock("Heroku Client")
+      @client_mock.should_receive(:info).any_number_of_times.and_return({:workers => 5})
       MiddleManagement::Manager.should_receive(:get_heroku_client).any_number_of_times.and_return(@client_mock)
     end
     describe "second call within 10 seconds" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middle_management
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Robby Grossman