haproxy-cluster 0.0.6 → 0.0.7

data/lib/haproxy_cluster.rb

@@ -1,5 +1,6 @@
 require 'haproxy_cluster/member'
 require 'timeout'
+require 'logger'
 require 'thread'
 
 class HAProxyCluster
@@ -7,18 +8,25 @@ class HAProxyCluster
   Inf = +1.0/0.0
   NegInf = -1.0/0.0
 
-  def initialize(members = [])
+  def initialize(members = [], log_level = Logger::INFO)
     @members = []
+    @log = Logger.new(STDOUT)
+    pp log_level
+    log.level = log_level
+    original_formatter = Logger::Formatter.new
+    @log.formatter = proc { |severity,datetime,progname,msg|
+      original_formatter.call(severity,datetime,self.class.to_s,msg)
+    }
     threads = []
     members.each do |url|
       threads << Thread.new do
-        @members << HAProxyCluster::Member.new(url)
+        @members << HAProxyCluster::Member.new(url,@log)
       end
     end
     threads.each{|t|t.join}
   end
 
-  attr_accessor :members
+  attr_accessor :members, :log
 
   # Poll the cluster, executing the given block with fresh data at the
   # prescribed interval.
@@ -57,7 +65,7 @@ class HAProxyCluster
   # * :condition, anything accepted by `check_condition`
   # * :interval, check interval (default 2 seconds, same as HA Proxy) 
   # * :timeout, give up after this number of seconds 
-  # * :min_checks, require :condition to pass this many times in a row
+  # * :min_checks, require :condition consecutive positive results 
   #
   def wait_until (options = {}, &code)
     opts = {
@@ -73,7 +81,10 @@ class HAProxyCluster
 
         # Break out as soon as we reach :min_checks in a row
         history << check_condition(opts[:condition], results.values.flatten)
-        return true if history.last(opts[:min_checks]) == [true] * opts[:min_checks]
+        if history.last(opts[:min_checks]) == [true] * opts[:min_checks]
+          log.info { "Ok, we've seen #{opts[:min_checks]} consecutive successful results." }
+          return true
+        end
 
         sleep opts[:interval]
         each_member { poll! }

data/lib/haproxy_cluster/backend.rb

@@ -19,12 +19,12 @@ class HAProxyCluster
     end
 
     def rolling_restartable? (enough = 80)
-      up_servers = @servers.map{ |name,server| s.ok? }.count
+      up_servers = @servers.map{ |name,server| server.ok? }.count
       if up_servers == 0
         @member.log.warn { "All servers are down; can't hurt!" }
         return true
       elsif Rational(up_servers,@servers.count) >= Rational(enough,100)
-        @member.log.info { "#{up_servers}/#{@servers.count} is at least #{enough}%!" }
+        @member.log.debug { "#{up_servers}/#{@servers.count} is at least #{enough}%!" }
         return true
       else
         @member.log.warn { "Insufficient capacity to handle a rolling restart at this time." }

data/lib/haproxy_cluster/cli.rb

@@ -10,14 +10,18 @@ require 'haproxy_cluster'
 Signal.trap("INT"){exit 1}
 
 options = OpenStruct.new
+options.log_level = Logger::INFO
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename $0} ARGS URL [URL] [...]"
   opts.on("-e", "--eval=CODE", "Ruby code block to be evaluated") do |o|
     options.code_string = o
   end
   opts.on("-v", "--verbose", "Verbose logging") do
-    # TODO Need better coverage here
     RestClient.log = STDERR
+    options.log_level = Logger::DEBUG
+  end
+  opts.on("-q", "--quiet", "Only report problems") do
+    options.log_level = Logger::WARN
   end
   opts.on("--csv", "Assume result will be an Array of Arrays and emit as CSV") do
     options.csv = true
@@ -37,10 +41,10 @@ if options.code_string
 
   if options.timeout
     result = Timeout::timeout(options.timeout) do 
-      Kernel.eval( options.code_string, HAProxyCluster.new(options.urls).instance_eval("binding") )
+      Kernel.eval( options.code_string, HAProxyCluster.new(options.urls, options.log_level).instance_eval("binding") )
     end
   else
-    result = Kernel.eval( options.code_string, HAProxyCluster.new(options.urls).instance_eval("binding") )
+    result = Kernel.eval( options.code_string, HAProxyCluster.new(options.urls, options.log_level).instance_eval("binding") )
   end
 
   case result.class.to_s

data/lib/haproxy_cluster/member.rb

@@ -1,5 +1,4 @@
 require 'csv'
-require 'logger'
 require 'rest-client'
 require 'haproxy_cluster/backend'
 require 'haproxy_cluster/server'
@@ -7,13 +6,9 @@ require 'haproxy_cluster/server'
 class HAProxyCluster
   class Member
 
-    def initialize(source)
+    def initialize(source,log)
       @source = source
-      @log = Logger.new(STDOUT)
-      original_formatter = Logger::Formatter.new
-      @log.formatter = proc { |severity,datetime,progname,msg|
-        original_formatter.call(severity,datetime,"HAProxyCluster",msg)
-      }
+      @log = log
       @backends = Hash.new { |h,k| h[k] = Backend.new({},self) }
       if source =~ /https?:/
         @type = :url

data/lib/haproxy_cluster/version.rb

@@ -1,3 +1,3 @@
 class HAProxyCluster
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70259727274420 !ruby/object:Gem::Requirement
+  requirement: &70281269238780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259727274420
+  version_requirements: *70281269238780
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70259727299520 !ruby/object:Gem::Requirement
+  requirement: &70281269236340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259727299520
+  version_requirements: *70281269236340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70259727295540 !ruby/object:Gem::Requirement
+  requirement: &70281269233120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259727295540
+  version_requirements: *70281269233120
 description: ! "  Gem and command line tool for quickly answering questions like,
   \"Can we\n  survive a rolling restart?\", \"How many transactions per second am
   I seeing?\",\n  \"What's my session backlog?\". Intended for use within continuous