heroku-scalr 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-scalr (0.2.2)
+    heroku-scalr (0.2.3)
       heroku-api (~> 0.3.8)
       timers
 

data/heroku-scalr.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = File.basename(__FILE__, '.gemspec')
   s.summary     = "Watch and scale your dynos!"
   s.description = "Issues recurring 'pings' to your Heroku apps and scales dynos up or down depending on pre-defined rules"
-  s.version     = "0.2.2"
+  s.version     = "0.2.3"
 
   s.authors     = ["Black Square Media"]
   s.email       = "info@blacksquaremedia.com"

data/lib/heroku/scalr/app.rb

@@ -12,7 +12,7 @@ class Heroku::Scalr::App
     min_frequency: 60
   }.freeze
 
-  attr_reader :name, :http, :api, :interval, :min_dynos, :max_dynos,
+  attr_reader :name, :url, :api, :interval, :min_dynos, :max_dynos,
               :metric, :wait_low, :wait_high, :ping_low, :ping_high,
               :min_frequency, :last_scaled_at
 
@@ -41,8 +41,8 @@ class Heroku::Scalr::App
     fail("max_dynos must be at least 1") unless opts[:max_dynos] >= 1
     fail("interval must be at least 10") unless opts[:interval] >= 10
 
-    @http = Excon.new(opts[:url] || "http://#{@name}.herokuapp.com/robots.txt")
-    @api  = Heroku::API.new api_key: opts[:api_key]
+    @url = opts[:url] || "http://#{@name}.herokuapp.com/robots.txt"
+    @api = Heroku::API.new api_key: opts[:api_key]
 
     @interval  = opts[:interval].to_i
     @min_dynos = opts[:min_dynos].to_i

data/lib/heroku/scalr/metric.rb

@@ -26,6 +26,14 @@ module Heroku::Scalr::Metric
 
     protected
 
+      def http_get
+        Excon.head(@app.url)
+      rescue Excon::Errors::Timeout
+        Excon::Response.new(status: 598)
+      rescue Excon::Errors::Error
+        Excon::Response.new(status: 444)
+      end
+
       def compare(ms, low, high)
         ms <= low ? -1 : (ms >= high ? 1 : 0)
       end
@@ -43,7 +51,7 @@ module Heroku::Scalr::Metric
       status = nil
 
       real = Benchmark.realtime do
-        status = @app.http.get.status
+        status = http_get.status
       end
 
       unless status == 200
@@ -63,7 +71,7 @@ module Heroku::Scalr::Metric
 
     # @see Heroku::Scalr::Metric::Abstract#by
     def by
-      ms = @app.http.get.headers["X-Heroku-Queue-Wait"]
+      ms = http_get.headers["X-Heroku-Queue-Wait"]
       unless ms
         log :warn, "unable to determine queue wait time"
         return 0

data/spec/heroku/scalr/app_spec.rb

@@ -9,7 +9,7 @@ describe Heroku::Scalr::App do
   end
 
   its(:name)            { should == 'name' }
-  its(:http)            { should be_instance_of(Excon::Connection) }
+  its(:url)             { should == 'http://name.herokuapp.com/robots.txt' }
   its(:api)             { should be_instance_of(Heroku::API) }
   its(:metric)          { should be_instance_of(Heroku::Scalr::Metric::Ping) }
 

data/spec/heroku/scalr/metric_spec.rb

@@ -15,17 +15,31 @@ end
 
 describe Heroku::Scalr::Metric::Abstract do
 
+  let!(:http_request) { stub_request(:head, "http://name.herokuapp.com/robots.txt") }
   let(:app) { Heroku::Scalr::App.new('name', api_key: 'key') }
   subject   { described_class.new(app) }
+
   its(:by)  { should == 0 }
 
+  it "should perform HTTP pings" do
+    res = subject.send(:http_get)
+    res.status.should == 200
+    http_request.should have_been_made
+  end
+
+  it "should catch HTTP errors" do
+    Excon.stub!(:head).and_raise(Excon::Errors::Timeout)
+    res = subject.send(:http_get)
+    res.status.should == 598
+  end
+
 end
 
 describe Heroku::Scalr::Metric::Ping do
 
   let(:app)           { Heroku::Scalr::App.new('name', api_key: 'key') }
   let(:ping_time)     { 0.250 }
-  let!(:http_request) { stub_request(:get, "http://name.herokuapp.com/robots.txt") }
+  let!(:http_request) { stub_request(:head, "http://name.herokuapp.com/robots.txt") }
 
   subject   { described_class.new(app) }
   before    { Benchmark.stub(:realtime).and_yield.and_return(ping_time) }
@@ -58,7 +72,7 @@ describe Heroku::Scalr::Metric::Ping do
   describe "failed requests" do
 
     let! :http_request do
-      stub_request(:get, "http://name.herokuapp.com/robots.txt").to_return(status: 404)
+      stub_request(:head, "http://name.herokuapp.com/robots.txt").to_return(status: 404)
     end
 
     it 'should not scale' do
@@ -79,7 +93,7 @@ describe Heroku::Scalr::Metric::Wait do
   describe "low queue wait time" do
 
     let! :http_request do
-      stub_request(:get, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 3 })
+      stub_request(:head, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 3 })
     end
 
     it 'should scale down' do
@@ -92,7 +106,7 @@ describe Heroku::Scalr::Metric::Wait do
   describe "high queue wait time" do
 
     let! :http_request do
-      stub_request(:get, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 300 })
+      stub_request(:head, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 300 })
     end
 
     it 'should scale up' do
@@ -105,7 +119,7 @@ describe Heroku::Scalr::Metric::Wait do
   describe "normal queue wait time" do
 
     let! :http_request do
-      stub_request(:get, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 20 })
+      stub_request(:head, "http://name.herokuapp.com/robots.txt").to_return(body: "", headers: { "X-Heroku-Queue-Wait" => 20 })
     end
 
     it 'should not scale' do
@@ -118,7 +132,7 @@ describe Heroku::Scalr::Metric::Wait do
   describe "queue wait unretrievable" do
 
     let! :http_request do
-      stub_request(:get, "http://name.herokuapp.com/robots.txt")
+      stub_request(:head, "http://name.herokuapp.com/robots.txt")
     end
 
     it 'should not scale' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-scalr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors: