right_support 1.2.0 → 1.3.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 RightScale, Inc.
+Copyright (c) 2009-2012 RightScale, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/right_support/db/cassandra_model.rb

@@ -72,7 +72,43 @@ rescue LoadError => e
   # Missing 'cassandra/0.8' indicates that the cassandra gem is not installed; we can ignore this
 end
 
+# monkey patch thrift to work with jruby
+if (RUBY_PLATFORM =~ /java/)
+  begin
+    require 'thrift'
+    module Thrift
+      class Socket
+        def open
+          begin
+            addrinfo = ::Socket::getaddrinfo(@host, @port).first
+            @handle = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
+            sockaddr = ::Socket.sockaddr_in(addrinfo[1], addrinfo[3])
+            begin
+              @handle.connect_nonblock(sockaddr)
+            rescue Errno::EINPROGRESS
+              resp = IO.select(nil, [ @handle ], nil, @timeout) # 3 lines removed here, 1 line added
+              begin
+                @handle.connect_nonblock(sockaddr)
+              rescue Errno::EISCONN
+              end
+            end
+            @handle
+          rescue StandardError => e
+            raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
+          end
+        end
+      end
+    end
+  rescue LoadError => e
+    # Make sure we're dealing with a legitimate missing-file LoadError
+    raise e unless e.message =~ /^no such file to load/
+  end
+end
+
+
 module RightSupport::DB
+  # Exception that indicates database configuration info is missing.
+  class MissingConfiguration < Exception; end
 
   # Base class for a column family in a keyspace
   # Used to access data persisted in Cassandra
@@ -116,14 +152,22 @@ module RightSupport::DB
 
       # Client connected to Cassandra server
       # Create connection if does not already exist
+      # Use BinaryProtocolAccelerated if it available
       #
       # === Return
       # (Cassandra):: Client connected to server
       def conn
         return @@conn if @@conn
 
+        # TODO remove hidden dependency on ENV['RACK_ENV'] (maybe require config= to accept a sub hash?)
         config = @@config[ENV["RACK_ENV"]]
-        @@conn = Cassandra.new(keyspace, config["server"],{:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT})
+        raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" unless config
+
+        thrift_client_options = {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT}
+        thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
+          if defined? Thrift::BinaryProtocolAccelerated
+
+        @@conn = Cassandra.new(keyspace, config["server"], thrift_client_options)
         @@conn.disable_node_auto_discovery!
         @@conn
       end
@@ -162,6 +206,8 @@ module RightSupport::DB
 
       # Get raw row(s) for specified primary key(s)
       # Unless :count is specified, a maximum of 100 columns are retrieved
+      # except in the case of an individual primary key request, in which
+      # case all columns are retrieved
       #
       # === Parameters
       # k(String|Array):: Individual primary key or list of keys on which to match
@@ -173,8 +219,25 @@ module RightSupport::DB
       def real_get(k, opt = {})
         if k.is_a?(Array)
           do_op(:multi_get, column_family, k, opt)
-        else      
+        elsif opt[:count]
           do_op(:get, column_family, k, opt)
+        else
+          opt = opt.clone
+          opt[:start] ||= ""
+          opt[:count] = DEFAULT_COUNT
+          columns = Cassandra::OrderedHash.new
+          while true
+            chunk = do_op(:get, column_family, k, opt)
+            columns.merge!(chunk)
+            if chunk.size == opt[:count]
+              # Assume there are more chunks, use last key as start of next get
+              opt[:start] = chunk.keys.last
+            else
+              # This must be the last chunk
+              break
+            end
+          end
+          columns
         end
       end
 
@@ -312,12 +375,19 @@ module RightSupport::DB
       end
 
       # Reconnect to Cassandra server
+      # Use BinaryProtocolAccelerated if it available
       #
       # === Return
       # true:: Always return true
       def reconnect
         config = @@config[ENV["RACK_ENV"]]
-        @@conn = Cassandra.new(keyspace, config["server"], {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT})
+        raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" unless config
+
+        thrift_client_options = {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT}
+        thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
+          if defined? Thrift::BinaryProtocolAccelerated
+
+        @@conn = Cassandra.new(keyspace, config["server"], thrift_client_options)
         @@conn.disable_node_auto_discovery!
         true
       end
@@ -329,7 +399,8 @@ module RightSupport::DB
       def ring
         conn.ring
       end
-    end
+
+    end # self
 
     attr_accessor :key, :attributes
 

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

@@ -30,7 +30,7 @@ module RightSupport::Net::Balancing
   class EndpointsStack
     DEFAULT_YELLOW_STATES = 4
     DEFAULT_RESET_TIME    = 300
-    
+
     def initialize(endpoints, yellow_states=nil, reset_time=nil, on_health_change=nil)
       @endpoints = Hash.new
       @yellow_states = yellow_states || DEFAULT_YELLOW_STATES
@@ -39,11 +39,11 @@ module RightSupport::Net::Balancing
       @min_n_level = 0
       endpoints.each { |ep| @endpoints[ep] = {:n_level => @min_n_level, :timestamp => 0} }
     end
-    
+
     def sweep
       @endpoints.each { |k,v| decrease_state(k, 0, Time.now) if Float(Time.now - v[:timestamp]) > @reset_time }
     end
-    
+
     def sweep_and_return_yellow_and_green
       sweep
       @endpoints.select { |k,v| v[:n_level] < @yellow_states }
@@ -82,14 +82,15 @@ module RightSupport::Net::Balancing
       @endpoints.each { |k, v| stats[k] = state_color(v[:n_level]) }
       stats
     end
-    
+
+    def update!(endpoints)
+      @endpoints.each { |k,v| endpoints.include?(k) ? endpoints.delete(k) : @endpoints.delete(k) }
+      endpoints.each  { |ep| @endpoints[ep] = {:n_level => @min_n_level, :timestamp => 0} }
+    end
+
   end
-  
-  # Implementation concepts: endpoints have three states, red, yellow and green.  Yellow
   # 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
-  # brief description of the state transitions:
-  # * green: last request was successful.
   #    * on success: remain green
   #    * on failure: change state to yellow and set it's health to healthiest (1)
   # * red: skip this server
@@ -109,16 +110,20 @@ module RightSupport::Net::Balancing
   # transitions from red to yellow, and so on.
 
   class HealthCheck
-    
-    def initialize(endpoints, options = {})
-      yellow_states = options[:yellow_states]
-      reset_time = options[:reset_time]
 
-      @health_check = options.delete(:health_check)
+    def initialize(options = {})
+      @options = options
+    end
 
-      @stack = EndpointsStack.new(endpoints, yellow_states, reset_time, options[:on_health_change])
-      @counter = rand(0xffff) % endpoints.size
-      @last_size = endpoints.size
+    def set_endpoints(endpoints)
+      if @stack
+        @stack.update!(endpoints)
+      else
+        @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])
+      end
     end
 
     def next
@@ -126,7 +131,7 @@ module RightSupport::Net::Balancing
       # following structure: [ [EP1, {:n_level => ..., :timestamp => ... }], [EP2, ... ] ]
       endpoints = @stack.sweep_and_return_yellow_and_green
       return nil if endpoints.empty?
-      
+
       # Selection of the next endpoint using RoundRobin
       @counter += 1 unless endpoints.size < @last_size
       @counter = 0 if @counter == endpoints.size
@@ -151,7 +156,7 @@ module RightSupport::Net::Balancing
     def bad(endpoint, t0, t1)
       @stack.increase_state(endpoint, t0, t1)
     end
-    
+
     def health_check(endpoint)
       t0 = Time.now
       result = @health_check.call(endpoint)
@@ -173,6 +178,6 @@ module RightSupport::Net::Balancing
     def get_stats
       @stack.get_stats
     end
-    
+
   end
 end

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

@@ -22,14 +22,19 @@
 
 module RightSupport::Net::Balancing
   class RoundRobin
-    def initialize(endpoints,options ={})
-      @endpoints = endpoints
+
+    def initialize(options ={})
+      @endpoints = []
       @counter = rand(0xffff)
     end
 
+    def set_endpoints(endpoints)
+      @endpoints = endpoints
+    end
+
     def next
       @counter += 1
-      [ @endpoints[@counter % @endpoints.size], false ]
+      [ @endpoints[@counter % @endpoints.size], false ] unless @endpoints.empty?
     end
 
     def good(endpoint, t0, t1)

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

@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module RightSupport::Net::Balancing
+
+  # Implementation concepts: Create a policy that selects an endpoint and sticks with it.
+  #
+  # The policy should:
+  # - iterate through each endpoint until a valid endpoint is found;
+  # - continue returning the same endpoint until it is no longer valid;
+  # - re-iterate through each endpoint when it's endpoint loses validity;
+  # - return an Exception if it performs a complete iteration though each endpoint and finds none valid;
+
+  class StickyPolicy
+
+    def initialize(options = {})
+      @health_check = options.delete(:health_check)
+      @endpoints = []
+      @counter = rand(0xffff)
+    end
+
+    def set_endpoints(endpoints)
+      unless @endpoints.empty?
+        last_chosen = self.next.first
+        @endpoints = []
+        if endpoints.include?(last_chosen)
+          @endpoints << last_chosen
+          @counter = 0
+        end
+      end
+      @endpoints |= endpoints
+    end
+
+    def next
+      [ @endpoints[@counter % @endpoints.size], true ] unless @endpoints.empty?
+    end
+
+    def good(endpoint, t0, t1)
+      #no-op; round robin does not care about failures
+    end
+
+    def bad(endpoint, t0, t1)
+      @counter += 1
+    end
+
+    def health_check(endpoint)
+      t0 = Time.now
+      result = @health_check.call(endpoint)
+      t1 = Time.now
+      if result
+        return true
+      else
+        @counter += 1
+        return false
+      end
+    rescue Exception => e
+      t1 = Time.now
+      @counter += 1
+      raise e
+    end
+
+  end
+end

data/lib/right_support/net/dns.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2009-2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited.  Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and the licensee.
+
+require 'socket'
+
+module RightSupport::Net
+
+  module DNS
+
+    def self.resolve_all_ip_addresses(hostnames)
+      ips       = []
+      hostnames = [hostnames] unless hostnames.respond_to?(:each)
+      hostnames.each do |hostname|
+        infos = nil
+        begin
+          infos = Socket.getaddrinfo(hostname, 443, Socket::AF_INET, Socket::SOCK_STREAM, Socket::IPPROTO_TCP)
+        rescue Exception => e
+          # NOTE: Need to figure out, which logger can we use here?
+          # Log.error "Rescued #{e.class.name} resolving Repose hostnames: #{e.message}; retrying"
+          retry
+        end
+
+        #Randomly permute the addrinfos of each hostname to help spread load.
+        infos.shuffle.each do |info|
+          ips << info[3]
+        end
+      end
+      ips
+    end
+
+  end
+end
+
+

data/lib/right_support/net/request_balancer.rb

@@ -2,7 +2,7 @@ module RightSupport::Net
   # Raised to indicate the (uncommon) error condition where a RequestBalancer rotated
   # through EVERY URL in a list without getting a non-nil, non-timeout response. 
   class NoResult < Exception; end
-  
+
   # Utility class that allows network requests to be randomly distributed across
   # a set of network endpoints. Generally used for REST requests by passing an
   # Array of HTTP service endpoint URLs.
@@ -74,6 +74,16 @@ module RightSupport::Net
       new(endpoints, options).request(&block)
     end
 
+    def resolve(endpoints)
+      endpoints = RightSupport::Net::DNS.resolve_all_ip_addresses(endpoints)
+      @resolved_at = Time.now.to_i
+      endpoints
+    end
+
+    def expired?
+      @options[:resolve] && Time.now.to_i - @resolved_at > @options[:resolve]
+    end
+
     # Constructor. Accepts a sequence of request endpoints which it shuffles randomly at
     # creation time; however, the ordering of the endpoints does not change thereafter
     # and the sequence is tried from the beginning for every request.
@@ -100,7 +110,8 @@ module RightSupport::Net
 
       @options[:policy] ||= RightSupport::Net::Balancing::RoundRobin
       @policy = @options[:policy]
-      @policy = @policy.new(endpoints, options) if @policy.is_a?(Class)
+      @policy = @policy.new(options) if @policy.is_a?(Class)
+
       unless test_policy_duck_type(@policy)
         raise ArgumentError, ":policy must be a class/object that responds to :next, :good and :bad"
       end
@@ -126,6 +137,12 @@ module RightSupport::Net
       end
 
       @endpoints = endpoints
+
+      if @options[:resolve]
+        @resolved_at = 0
+      else
+        @policy.set_endpoints(@endpoints)
+      end
     end
 
     # Perform a request.
@@ -144,6 +161,8 @@ module RightSupport::Net
     def request
       raise ArgumentError, "Must call this method with a block" unless block_given?
 
+      @policy.set_endpoints(self.resolve(@endpoints)) if self.expired?
+
       exceptions = []
       result     = nil
       complete   = false
@@ -159,7 +178,6 @@ module RightSupport::Net
         end
 
         endpoint, need_health_check  = @policy.next
-
         raise NoResult, "No endpoints are available" unless endpoint
         n += 1
         t0 = Time.now

data/lib/right_support/net/ssl/open_ssl_patch.rb

@@ -0,0 +1,67 @@
+module RightSupport::Net
+  module SSL
+    # A helper module that provides monkey patch for OpenSSL::SSL.verify_certificate_identity method.
+    #
+    # To start use it, all you need is to enable it and then register DNS name of the host, which
+    # you will trust for sure. This module automatically adds OpenSSL library and reopens
+    # verify_certificate_identity method, to change the SSL algorythm of hostname verification.
+    module OpenSSLPatch
+      class << self
+        @@status = false
+
+        def enable!
+          return if @@status
+          @@status = true
+
+          require 'openssl'
+          OpenSSL::SSL.module_exec do
+            def verify_certificate_identity(cert, hostname)
+              if RightSupport::Net::SSL::OpenSSLPatch.enabled?
+                actual_hostname = RightSupport::Net::SSL.expected_hostname
+              end
+              actual_hostname ||= hostname
+              verify_certificate_identity_without_hack(cert, actual_hostname)
+            end
+            module_function :verify_certificate_identity
+
+            # The original module function of OpenSSL::SSL
+            def verify_certificate_identity_without_hack(cert, hostname)
+              should_verify_common_name = true
+              cert.extensions.each{|ext|
+                next if ext.oid != "subjectAltName"
+                ext.value.split(/,\s+/).each{|general_name|
+                  if /\ADNS:(.*)/ =~ general_name
+                    should_verify_common_name = false
+                    reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
+                    return true if /\A#{reg}\z/i =~ hostname
+                  elsif /\AIP Address:(.*)/ =~ general_name
+                    should_verify_common_name = false
+                    return true if $1 == hostname
+                  end
+                }
+              }
+              if should_verify_common_name
+                cert.subject.to_a.each{|oid, value|
+                  if oid == "CN"
+                    reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
+                    return true if /\A#{reg}\z/i =~ hostname
+                  end
+                }
+              end
+              return false
+            end
+            module_function :verify_certificate_identity_without_hack
+          end
+        end
+
+        def disable!
+          @@status = false
+        end
+
+        def enabled?
+          @@status
+        end
+      end
+    end
+  end
+end

data/lib/right_support/net/ssl.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2009-2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET.  Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited.  Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and the licensee.
+
+require 'right_support/net/ssl/open_ssl_patch'
+
+module RightSupport::Net
+  module SSL
+    module_function
+
+    def expected_hostname
+      @expected_hostname
+    end
+
+    def with_expected_hostname(hostname, &block)
+      @expected_hostname = hostname
+      block.call
+    rescue Exception => e
+      @expected_hostname = nil
+      raise e
+    ensure
+      @expected_hostname = nil
+    end
+  end
+end
+
+RightSupport::Net::SSL::OpenSSLPatch.enable!

data/lib/right_support/net.rb

@@ -34,5 +34,7 @@ require 'right_support/net/http_client'
 require 'right_support/net/string_encoder'
 require 'right_support/net/balancing'
 require 'right_support/net/request_balancer'
+require 'right_support/net/ssl'
+require 'right_support/net/dns'
 
-RightSupport::Net.extend(RightSupport::Net::AddressHelper)
+RightSupport::Net.extend(RightSupport::Net::AddressHelper)

data/lib/right_support/stats/helpers.rb

@@ -193,25 +193,43 @@ module RightSupport
     #
     # === Parameters
     # stats(Hash):: Statistics with generic keys "name", "identity", "hostname", "service uptime",
-    #   "machine uptime", "stat time", "last reset time", "version", and "broker" with the
-    #   latter two and "machine uptime" being optional; any other keys ending with "stats"
-    #   have an associated hash value that is displayed in sorted key order
+    #   "machine uptime", "memory KB", "stat time", "last reset time", "version", and "broker" with
+    #   the latter two and "machine uptime", "memory KB", "version", and "broker" being optional;
+    #   any other keys ending with "stats" have an associated hash value that is displayed in sorted
+    #   key order, unless "stats" is preceded by a non-blank, in which case that character is prepended
+    #   to the key to drive the sort order
+    # options(Hash):: Formatting options
+    #   :name_width(Integer):: Maximum characters in displayed stat name
+    #   :sub_name_width(Integer):: Maximum characters in displayed sub-stat name
+    #   :sub_stat_value_width(Integer):: Maximum characters in displayed sub-stat value line
+    #   :exception_message_width(Integer):: Maximum characters displayed for exception message
     #
     # === Return
     # (String):: Display string
-    def self.stats_str(stats)
-      name_width = MAX_STAT_NAME_WIDTH
+    def self.stats_str(stats, options = {})
+      name_width = options[:name_width] || MAX_STAT_NAME_WIDTH
+
       str = stats["name"] ? sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "name", stats["name"]) : ""
       str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "identity", stats["identity"]) +
              sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "hostname", stats["hostname"]) +
              sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "stat time", time_at(stats["stat time"])) +
              sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "last reset", time_at(stats["last reset time"])) +
              sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "service up", elapsed(stats["service uptime"]))
-      str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "machine up", elapsed(stats["machine uptime"])) if stats.has_key?("machine uptime")
-      str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "memory KB", stats["memory"]) if stats.has_key?("memory")
-      str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "version", stats["version"].to_i) if stats.has_key?("version")
-      str += brokers_str(stats["brokers"], name_width) if stats.has_key?("brokers")
-      stats.to_a.sort.each { |k, v| str += sub_stats_str(k[0..-7], v, name_width) if k.to_s =~ /stats$/ }
+      if stats.has_key?("machine uptime")
+        str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "machine up", elapsed(stats["machine uptime"]))
+      end
+      if stats.has_key?("memory")
+        str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "memory KB", stats["memory"])
+      end
+      if stats.has_key?("version")
+        str += sprintf("%-#{name_width}s#{SEPARATOR}%s\n", "version", stats["version"].to_i)
+      end
+      if stats.has_key?("brokers")
+         str += brokers_str(stats["brokers"], options)
+      end
+      stats.to_a.sort_by { |(k, v)| k.to_s =~ /(.)stats$/ ? ($1 == ' ' ? '~' : $1) + k : k }.each do |k, v|
+        str += sub_stats_str(k[0..-7], v, options) if k.to_s =~ /stats$/
+      end
       str
     end
 
@@ -234,13 +252,20 @@ module RightSupport
     #   "heartbeat"(Integer|nil):: Number of seconds between AMQP heartbeats, or nil if heartbeat disabled
     #   "returns"(Hash|nil):: Message return activity stats with keys "total", "percent", "last", and "rate"
     #     with percentage breakdown per request type, or nil if none
-    # name_width(Integer):: Fixed width for left-justified name display
+    # options(Hash):: Formatting options
+    #   :name_width(Integer):: Fixed width for left-justified name display
+    #   :sub_name_width(Integer):: Maximum characters in displayed sub-stat name
+    #   :sub_stat_value_width(Integer):: Maximum characters in displayed sub-stat value line
+    #   :exception_message_width(Integer):: Maximum characters displayed for exception message
     #
     # === Return
     # str(String):: Broker display with one line per broker plus exceptions
-    def self.brokers_str(brokers, name_width)
+    def self.brokers_str(brokers, options = {})
+      name_width = options[:name_width] || MAX_STAT_NAME_WIDTH
+      sub_name_width = options[:sub_name_width] || MAX_SUB_STAT_NAME_WIDTH
+      sub_stat_value_width = options[:sub_stat_value_width] || MAX_SUB_STAT_VALUE_WIDTH
+
       value_indent = " " * (name_width + SEPARATOR.size)
-      sub_name_width = MAX_SUB_STAT_NAME_WIDTH
       sub_value_indent = " " * (name_width + sub_name_width + (SEPARATOR.size * 2))
       str = sprintf("%-#{name_width}s#{SEPARATOR}", "brokers")
       brokers["brokers"].each do |b|
@@ -263,7 +288,7 @@ module RightSupport
       str += if brokers["exceptions"].nil? || brokers["exceptions"].empty?
         "none\n"
       else
-        exceptions_str(brokers["exceptions"], sub_value_indent) + "\n"
+        exceptions_str(brokers["exceptions"], sub_value_indent, options) + "\n"
       end
       str += value_indent
       str += sprintf("%-#{sub_name_width}s#{SEPARATOR}", "heartbeat")
@@ -277,7 +302,7 @@ module RightSupport
       str += if brokers["returns"].nil? || brokers["returns"].empty?
         "none\n"
       else
-        wrap(activity_str(brokers["returns"]), MAX_SUB_STAT_VALUE_WIDTH, sub_value_indent, ", ") + "\n"
+        wrap(activity_str(brokers["returns"]), sub_stat_value_width, sub_value_indent, ", ") + "\n"
       end
     end
 
@@ -296,13 +321,20 @@ module RightSupport
     # === Parameters
     # name(String):: Display name for the stat
     # value(Object):: Value of this stat
-    # name_width(Integer):: Fixed width for left-justified name display
+    # options(Hash):: Formatting options
+    #   :name_width(Integer):: Fixed width for left-justified name display
+    #   :sub_name_width(Integer):: Maximum characters in displayed sub-stat name
+    #   :sub_stat_value_width(Integer):: Maximum characters in displayed sub-stat value line
+    #   :exception_message_width(Integer):: Maximum characters displayed for exception message
     #
     # === Return
     # (String):: Single line display of stat
-    def self.sub_stats_str(name, value, name_width)
+    def self.sub_stats_str(name, value, options = {})
+      name_width = options[:name_width] || MAX_STAT_NAME_WIDTH
+      sub_name_width = options[:sub_name_width] || MAX_SUB_STAT_NAME_WIDTH
+      sub_stat_value_width = options[:sub_stat_value_width] || MAX_SUB_STAT_VALUE_WIDTH
+
       value_indent = " " * (name_width + SEPARATOR.size)
-      sub_name_width = MAX_SUB_STAT_NAME_WIDTH
       sub_value_indent = " " * (name_width + sub_name_width + (SEPARATOR.size * 2))
       sprintf("%-#{name_width}s#{SEPARATOR}", name) + value.to_a.sort.map do |attr|
         k, v = attr
@@ -317,13 +349,13 @@ module RightSupport
           if v.empty? || v["total"] == 0
             "none"
           elsif v["total"]
-            wrap(activity_str(v), MAX_SUB_STAT_VALUE_WIDTH, sub_value_indent, ", ")
+            wrap(activity_str(v), sub_stat_value_width, sub_value_indent, ", ")
           elsif k =~ /last$/
             last_activity_str(v)
           elsif k == "exceptions"
-            exceptions_str(v, sub_value_indent)
+            exceptions_str(v, sub_value_indent, options)
           else
-            wrap(hash_str(v), MAX_SUB_STAT_VALUE_WIDTH, sub_value_indent, ", ")
+            wrap(hash_str(v), sub_stat_value_width, sub_value_indent, ", ")
           end
         else
           "#{v || "none"}"
@@ -394,16 +426,19 @@ module RightSupport
     #   "total"(Integer):: Total exceptions for this category
     #   "recent"(Array):: Most recent as a hash of "count", "type", "message", "when", and "where"
     # indent(String):: Indentation for each line
+    # options(Hash):: Formatting options
+    #   :exception_message_width(Integer):: Maximum characters displayed for exception message
     #
     # === Return
     # (String):: Exceptions in displayable format with line separators
-    def self.exceptions_str(exceptions, indent)
+    def self.exceptions_str(exceptions, indent, options = {})
+      exception_message_width = options[:exception_message_width] || MAX_EXCEPTION_MESSAGE_WIDTH
       indent2 = indent + (" " * 4)
       exceptions.to_a.sort.map do |k, v|
         sprintf("%s total: %d, most recent:\n", k, v["total"]) + v["recent"].reverse.map do |e|
           message = e["message"]
-          if message && message.size > (MAX_EXCEPTION_MESSAGE_WIDTH - 3)
-            message = e["message"][0, MAX_EXCEPTION_MESSAGE_WIDTH - 3] + "..."
+          if message && message.size > (exception_message_width - 3)
+            message = e["message"][0, exception_message_width - 3] + "..."
           end
           indent + "(#{e["count"]}) #{time_at(e["when"])} #{e["type"]}: #{message}\n" + indent2 + "#{e["where"]}"
         end.join("\n")

data/lib/right_support.rb

@@ -1,3 +1,6 @@
+# Workaround for badly-coded gems such as active_support which fail to require this for themselves
+require 'thread'
+
 require 'right_support/ruby'
 require 'right_support/crypto'
 require 'right_support/db'

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.2.0'
-  s.date    = '2012-01-23'
+  s.version = '1.3.0'
+  s.date    = '2012-03-06'
 
   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: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Tony Spataro
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 -08:00
+date: 2012-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -51,8 +51,12 @@ files:
 - lib/right_support/net/balancing.rb
 - lib/right_support/net/balancing/health_check.rb
 - lib/right_support/net/balancing/round_robin.rb
+- lib/right_support/net/balancing/sticky_policy.rb
+- lib/right_support/net/dns.rb
 - lib/right_support/net/http_client.rb
 - lib/right_support/net/request_balancer.rb
+- lib/right_support/net/ssl.rb
+- lib/right_support/net/ssl/open_ssl_patch.rb
 - lib/right_support/net/string_encoder.rb
 - lib/right_support/rack.rb
 - lib/right_support/rack/custom_logger.rb