right_support 1.3.0 → 1.3.1

data/lib/right_support/db/cassandra_model.rb

@@ -119,7 +119,7 @@ module RightSupport::DB
     DEFAULT_TIMEOUT = 10
 
     # Default maximum number of rows to retrieve in one chunk
-    DEFAULT_COUNT = 1000
+    DEFAULT_COUNT = 100
 
     # Wrappers for Cassandra client
     class << self
@@ -223,7 +223,6 @@ module RightSupport::DB
           do_op(:get, column_family, k, opt)
         else
           opt = opt.clone
-          opt[:start] ||= ""
           opt[:count] = DEFAULT_COUNT
           columns = Cassandra::OrderedHash.new
           while true

data/lib/right_support/net/balancing/health_check.rb

@@ -31,7 +31,8 @@ module RightSupport::Net::Balancing
     DEFAULT_YELLOW_STATES = 4
     DEFAULT_RESET_TIME    = 300
 
-    def initialize(endpoints, yellow_states=nil, reset_time=nil, on_health_change=nil)
+    def initialize(policy, endpoints, yellow_states=nil, reset_time=nil, on_health_change=nil)
+      @policy = policy
       @endpoints = Hash.new
       @yellow_states = yellow_states || DEFAULT_YELLOW_STATES
       @reset_time = reset_time || DEFAULT_RESET_TIME
@@ -60,6 +61,7 @@ module RightSupport::Net::Balancing
     def update_state(endpoint, change, t1)
       @endpoints[endpoint][:timestamp] = t1
       n_level = @endpoints[endpoint][:n_level] += change
+      logger.info("RequestBalancer: Health of endpoint '#{endpoint}' #{change < 0 ? 'improved' : 'worsened'} to '#{state_color(n_level)}'")
       if @on_health_change &&
          (n_level < @min_n_level ||
          (n_level > @min_n_level && n_level == @endpoints.map { |(k, v)| v[:n_level] }.min))
@@ -88,6 +90,10 @@ module RightSupport::Net::Balancing
       endpoints.each  { |ep| @endpoints[ep] = {:n_level => @min_n_level, :timestamp => 0} }
     end
 
+    # Return the logger that our surrounding policy uses
+    def logger
+      @policy.logger
+    end
   end
   # has several levels (@yellow_states) to determine the health of the endpoint. The
   # balancer works by avoiding "red" endpoints and retrying them after awhile.  Here is a
@@ -110,6 +116,7 @@ module RightSupport::Net::Balancing
   # transitions from red to yellow, and so on.
 
   class HealthCheck
+    include RightSupport::Log::Mixin
 
     def initialize(options = {})
       @options = options
@@ -122,7 +129,7 @@ module RightSupport::Net::Balancing
         @health_check = @options.delete(:health_check)
         @counter = rand(0xffff) % endpoints.size
         @last_size = endpoints.size
-        @stack = EndpointsStack.new(endpoints, @options[:yellow_states], @options[:reset_time], @options[:on_health_change])
+        @stack = EndpointsStack.new(self, endpoints, @options[:yellow_states], @options[:reset_time], @options[:on_health_change])
       end
     end
 

data/lib/right_support/validation/openssl.rb

@@ -65,6 +65,7 @@ module RightSupport::Validation
       alg = pem_key?(key_material)
       return false unless alg
       key = alg.new(key_material, passphrase || 'dummy passphrase, should never work')
+      key.to_der #make sure it's valid in addition to being well formed
       return key.private?
     rescue ::OpenSSL::PKey::PKeyError, NotImplementedError
       return false
@@ -82,6 +83,7 @@ module RightSupport::Validation
       alg = pem_key?(key_material)
       return false unless alg
       key = alg.new(key_material)
+      key.to_der #make sure it's valid in addition to being well formed
       return key.public?
     rescue ::OpenSSL::PKey::PKeyError, NotImplementedError
       return false

data/lib/right_support/validation/ssh.rb

@@ -60,7 +60,8 @@ if_require_succeeds('net/ssh') do
       # If the key is well-formed and valid, return true. Otherwise, return false.
       def ssh_public_key?(key_material)
         return false if key_material.nil? || key_material.empty?
-        ::Net::SSH::KeyFactory.load_data_public_key(key_material)
+        key = ::Net::SSH::KeyFactory.load_data_public_key(key_material)
+        key.to_der #make sure it's valid in addition to being well formed
         return true
       rescue ::Net::SSH::Exception, ::OpenSSL::PKey::PKeyError, NotImplementedError
         return false

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '1.3.0'
-  s.date    = '2012-03-06'
+  s.version = '1.3.1'
+  s.date    = '2012-03-14'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Tony Spataro
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 -08:00
+date: 2012-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: []