hipstascale 0.1.3 → 0.1.4

data/lib/hipsta_scale/new_relic.rb

@@ -30,9 +30,12 @@ module HipstaScale
     private
     
     def params
+      end_time   = Time.now
+      begin_time = end_time - (app.interval < 60 ? 60 : app.interval)
+      
       ''.tap do |params|
-        params << 'begin='      << (Time.now - (app.interval * 60)).strftime('%Y-%m-%dT%H:%M:%S%z')
-        params << '&end='       << Time.now.strftime('%Y-%m-%dT%H:%M:%S%z')
+        params << 'begin='      << begin_time.strftime('%Y-%m-%dT%H:%M:%S%z')
+        params << '&end='       << end_time.strftime('%Y-%m-%dT%H:%M:%S%z')
         params << '&field='     << 'busy_percent'
         params << '&metrics[]=' << 'Instance/Busy'
       end

data/lib/hipsta_scale/process.rb

@@ -3,33 +3,45 @@ require 'eventmachine'
 module HipstaScale
   class Process
     
+    attr_reader :app
+    
     def self.run!
       EventMachine.run do
+        HipstaScale.logger.info "HipstaScale is watching #{HipstaScale.apps.size} #{HipstaScale.apps.size == 1 ? 'application' : 'applications'}"
         HipstaScale.apps.each do |app|
           Process.new(app)
-          # Simple way to make sure all of our external calls don't happen all
-          # at once.
-          sleep(10)
         end
       end
     end
     
     def initialize(app)
-      logger.info "Check usage for #{app.name} every #{app.interval * 60} seconds"
-      EventMachine.add_periodic_timer(app.interval * 60) do
-        app.tick do
-          logger.info "[#{app.name.upcase}] Instance usage: %.2f%%" % (app.current_load * 100.0)        
-          logger.info "[#{app.name.upcase}] Amount of processes needed to reach the %.2f%% of target load: #{app.processes_needed}" % (app.load_limit * 100)
-          
-          if app.processes_needed != app.processes_running
-            logger.info "[#{app.name.upcase}] Scaling processes from #{app.processes_running} to #{app.processes_needed}"
-            app.scale!
-          end
+      @app = app
+      
+      time_slot = Random.rand(1..(app.interval / 2)) 
+      
+      logger.info "Checking usage for '#{app.name}' every #{app.interval} #{app.interval == 1 ? 'second' : 'seconds'}"
+      logger.info "Will start in #{time_slot} #{time_slot == 1 ? 'second' : 'seconds'}..."
+      
+      # Simple way of spacing out the timers so they don't all run at once.
+      EventMachine::add_timer(time_slot) do
+        EventMachine.add_periodic_timer(app.interval) { self.check }
+        self.check
+      end
+    end
+    
+    def check
+      app.tick do
+        logger.info "[#{app.name.upcase}] Instance usage: %.2f%%" % (app.current_load * 100.0)        
+        logger.info "[#{app.name.upcase}] Amount of processes needed to reach the %.2f%% of target load: #{app.processes_needed}" % (app.load_limit * 100)
+        
+        if app.processes_needed != app.processes_running
+          logger.info "[#{app.name.upcase}] Scaling processes from #{app.processes_running} to #{app.processes_needed}"
+          app.scale!
         end
       end
     end
     
-  private
+    private
   
     def logger
       HipstaScale.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hipstascale
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70236309054120 !ruby/object:Gem::Requirement
+  requirement: &70107264395760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70236309054120
+  version_requirements: *70107264395760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70236309053360 !ruby/object:Gem::Requirement
+  requirement: &70107264395200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70236309053360
+  version_requirements: *70107264395200
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70236309052380 !ruby/object:Gem::Requirement
+  requirement: &70107264394380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70236309052380
+  version_requirements: *70107264394380
 description: HipstaScale helps create long-running processes that use NewRelic RPM
   information to scale your Heroku instances before you need it.
 email: jeremy@jeremyboles.com