raindrops 0.7.0 → 0.8.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.7.0.GIT
+DEF_VER=v0.8.0.GIT
 
 LF='
 '

data/TODO

@@ -1 +1 @@
-* pure Ruby version for non-forking servers
+* pure Ruby version for non-forking servers (patches welcome!)

data/lib/raindrops/watcher.rb

@@ -58,6 +58,10 @@ require "aggregate"
 #
 # e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
 #
+# === POST /reset/$LISTENER
+#
+# Resets the active and queued statistics for the given listener.
+#
 # === GET /tail/$LISTENER.txt?active_min=1&queued_min=1
 #
 # Streams chunked a response to the client.
@@ -85,6 +89,9 @@ require "aggregate"
 # - X-Std-Dev - standard deviation of connection count
 # - X-Outliers-Low - number of low outliers (hopefully many for queued)
 # - X-Outliers-High - number of high outliers (hopefully zero for queued)
+# - X-Current - current number of connections
+# - X-First-Peak-At - date of when X-Max was first reached
+# - X-Last-Peak-At - date of when X-Max was last reached
 #
 # = Demo Server
 #
@@ -100,6 +107,7 @@ class Raindrops::Watcher
   include Rack::Utils
   include Raindrops::Linux
   DOC_URL = "http://raindrops.bogomips.org/Raindrops/Watcher.html"
+  Peak = Struct.new(:first, :last)
 
   def initialize(opts = {})
     @tcp_listeners = @unix_listeners = nil
@@ -112,12 +120,14 @@ class Raindrops::Watcher
       end
     end
 
-    agg_class = opts[:agg_class] || Aggregate
-    start = Time.now.utc
-    @active = Hash.new { |h,k| h[k] = agg_class.new }
-    @queued = Hash.new { |h,k| h[k] = agg_class.new }
-    @resets = Hash.new { |h,k| h[k] = start }
-    @snapshot = [ start, {} ]
+    @agg_class = opts[:agg_class] || Aggregate
+    @start_time = Time.now.utc
+    @active = Hash.new { |h,k| h[k] = @agg_class.new }
+    @queued = Hash.new { |h,k| h[k] = @agg_class.new }
+    @resets = Hash.new { |h,k| h[k] = @start_time }
+    @peak_active = Hash.new { |h,k| h[k] = Peak.new(@start_time, @start_time) }
+    @peak_queued = Hash.new { |h,k| h[k] = Peak.new(@start_time, @start_time) }
+    @snapshot = [ @start_time, {} ]
     @delay = opts[:delay] || 1
     @lock = Mutex.new
     @start = Mutex.new
@@ -142,6 +152,16 @@ class Raindrops::Watcher
     end
   end
 
+  def aggregate!(agg_hash, peak_hash, addr, number, now)
+    agg = agg_hash[addr]
+    if (max = agg.max) && number > 0 && number >= max
+      peak = peak_hash[addr]
+      peak.first = now if number > max
+      peak.last = now
+    end
+    agg << number
+  end
+
   def aggregator_thread(logger) # :nodoc:
     @socket = sock = Raindrops::InetDiagSocket.new
     thr = Thread.new do
@@ -149,11 +169,12 @@ class Raindrops::Watcher
         combined = tcp_listener_stats(@tcp_listeners, sock)
         combined.merge!(unix_listener_stats(@unix_listeners))
         @lock.synchronize do
+          now = Time.now.utc
           combined.each do |addr,stats|
-            @active[addr] << stats.active
-            @queued[addr] << stats.queued
+            aggregate!(@active, @peak_active, addr, stats.active, now)
+            aggregate!(@queued, @peak_queued, addr, stats.queued, now)
           end
-          @snapshot = [ Time.now.utc, combined ]
+          @snapshot = [ now, combined ]
           @cond.broadcast
         end
       rescue => e
@@ -165,17 +186,25 @@ class Raindrops::Watcher
     thr
   end
 
+  def non_existent_stats(time)
+    [ time, @start_time, @agg_class.new, 0, Peak.new(@start_time, @start_time) ]
+  end
+
   def active_stats(addr) # :nodoc:
     @lock.synchronize do
-      tmp = @active[addr] or return
-      [ @snapshot[0], @resets[addr], tmp.dup ]
+      time, combined = @snapshot
+      stats = combined[addr] or return non_existent_stats(time)
+      tmp, peak = @active[addr], @peak_active[addr]
+      [ time, @resets[addr], tmp.dup, stats.active, peak ]
     end
   end
 
   def queued_stats(addr) # :nodoc:
     @lock.synchronize do
-      tmp = @queued[addr] or return
-      [ @snapshot[0], @resets[addr], tmp.dup ]
+      time, combined = @snapshot
+      stats = combined[addr] or return non_existent_stats(time)
+      tmp, peak = @queued[addr], @peak_queued[addr]
+      [ time, @resets[addr], tmp.dup, stats.queued, peak ]
     end
   end
 
@@ -186,22 +215,31 @@ class Raindrops::Watcher
     end
   end
 
-  def agg_to_hash(reset_at, agg)
+  def std_dev(agg)
+    agg.std_dev.to_s
+  rescue Errno::EDOM
+    "NaN"
+  end
+
+  def agg_to_hash(reset_at, agg, current, peak)
     {
       "X-Count" => agg.count.to_s,
       "X-Min" => agg.min.to_s,
       "X-Max" => agg.max.to_s,
       "X-Mean" => agg.mean.to_s,
-      "X-Std-Dev" => agg.std_dev.to_s,
+      "X-Std-Dev" => std_dev(agg),
       "X-Outliers-Low" => agg.outliers_low.to_s,
       "X-Outliers-High" => agg.outliers_high.to_s,
       "X-Last-Reset" => reset_at.httpdate,
+      "X-Current" => current.to_s,
+      "X-First-Peak-At" => peak.first.httpdate,
+      "X-Last-Peak-At" => peak.last.httpdate,
     }
   end
 
   def histogram_txt(agg)
-    updated_at, reset_at, agg = *agg
-    headers = agg_to_hash(reset_at, agg)
+    updated_at, reset_at, agg, current, peak = *agg
+    headers = agg_to_hash(reset_at, agg, current, peak)
     body = agg.to_s
     headers["Content-Type"] = "text/plain"
     headers["Expires"] = (updated_at + @delay).httpdate
@@ -210,8 +248,8 @@ class Raindrops::Watcher
   end
 
   def histogram_html(agg, addr)
-    updated_at, reset_at, agg = *agg
-    headers = agg_to_hash(reset_at, agg)
+    updated_at, reset_at, agg, current, peak = *agg
+    headers = agg_to_hash(reset_at, agg, current, peak)
     body = "<html>" \
       "<head><title>#{hostname} - #{escape_html addr}</title></head>" \
       "<body><table>" <<
@@ -229,29 +267,31 @@ class Raindrops::Watcher
 
   def get(env)
     retried = false
-    case env["PATH_INFO"]
-    when "/"
-      index
-    when %r{\A/active/(.+)\.txt\z}
-      histogram_txt(active_stats(unescape($1)))
-    when %r{\A/active/(.+)\.html\z}
-      addr = unescape $1
-      histogram_html(active_stats(addr), addr)
-    when %r{\A/queued/(.+)\.txt\z}
-      histogram_txt(queued_stats(unescape($1)))
-    when %r{\A/queued/(.+)\.html\z}
-      addr = unescape $1
-      histogram_html(queued_stats(addr), addr)
-    when %r{\A/tail/(.+)\.txt\z}
-      tail(unescape($1), env)
-    else
-      not_found
-    end
+    begin
+      case env["PATH_INFO"]
+      when "/"
+        index
+      when %r{\A/active/(.+)\.txt\z}
+        histogram_txt(active_stats(unescape($1)))
+      when %r{\A/active/(.+)\.html\z}
+        addr = unescape $1
+        histogram_html(active_stats(addr), addr)
+      when %r{\A/queued/(.+)\.txt\z}
+        histogram_txt(queued_stats(unescape($1)))
+      when %r{\A/queued/(.+)\.html\z}
+        addr = unescape $1
+        histogram_html(queued_stats(addr), addr)
+      when %r{\A/tail/(.+)\.txt\z}
+        tail(unescape($1), env)
+      else
+        not_found
+      end
     rescue Errno::EDOM
       raise if retried
       retried = true
       wait_snapshot
       retry
+    end
   end
 
   def not_found

data/test/test_aggregate_pmq.rb

@@ -2,7 +2,7 @@ require "test/unit"
 require "raindrops"
 pmq = begin
   Raindrops::Aggregate::PMQ
-rescue => LoadError
+rescue LoadError => e
   warn "W: #{e} skipping test"
   false
 end

data/test/test_last_data_recv_unicorn.rb

@@ -6,7 +6,7 @@ require "net/http"
 $stderr.sync = $stdout.sync = true
 pmq = begin
   Raindrops::Aggregate::PMQ
-rescue => LoadError
+rescue LoadError => e
   warn "W: #{e} skipping test"
   false
 end
@@ -40,7 +40,7 @@ class TestLastDataRecvUnicorn < Test::Unit::TestCase
       end.to_app!
       def app.arity; 0; end
       def app.call; eval self; end
-      Unicorn.run(app, @opts)
+      Unicorn::HttpServer.new(app, @opts).start.join
     }
     400.times { assert_kind_of Net::HTTPSuccess, get("/") }
     resp = get("/ldr")

data/test/test_middleware_unicorn.rb

@@ -19,7 +19,7 @@ class TestMiddlewareUnicorn < Test::Unit::TestCase
       use Raindrops::Middleware
       run Rack::Lobster.new
     end
-    @srv = fork { Unicorn.run(@app, @opts) }
+    @srv = fork { Unicorn::HttpServer.new(@app, @opts).start.join }
 
     s = TCPSocket.new @host, @port
     s.write "GET /_raindrops HTTP/1.0\r\n\r\n"

data/test/test_middleware_unicorn_ipv6.rb

@@ -20,7 +20,7 @@ class TestMiddlewareUnicornIPv6 < Test::Unit::TestCase
       use Raindrops::Middleware
       run Rack::Lobster.new
     end
-    @srv = fork { Unicorn.run(@app, @opts) }
+    @srv = fork { Unicorn::HttpServer.new(@app, @opts).start.join }
     s = TCPSocket.new @host, @port
     s.write "GET /_raindrops HTTP/1.0\r\n\r\n"
     resp = s.read

data/test/test_watcher.rb

@@ -43,6 +43,20 @@ class TestWatcher < Test::Unit::TestCase
     check_headers(resp.headers)
   end
 
+  def test_invalid
+    assert_nothing_raised do
+      @req.get("/active/666.666.666.666%3A666.txt")
+      @req.get("/queued/666.666.666.666%3A666.txt")
+      @req.get("/active/666.666.666.666%3A666.html")
+      @req.get("/queued/666.666.666.666%3A666.html")
+    end
+    addr = @app.instance_eval do
+      @peak_active.keys + @peak_queued.keys +
+         @resets.keys + @active.keys + @queued.keys
+    end
+    assert addr.grep(/666\.666\.666\.666/).empty?, addr.inspect
+  end
+
   def test_active_html
     resp = @req.get "/active/#@addr.html"
     assert_equal 200, resp.status.to_i
@@ -96,4 +110,66 @@ class TestWatcher < Test::Unit::TestCase
       break
     end
   end
+
+  def test_x_current_header
+    env = @req.class.env_for "/active/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_equal "0", headers["X-Current"], headers.inspect
+
+    env = @req.class.env_for "/queued/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_equal "1", headers["X-Current"], headers.inspect
+
+    @ios << @srv.accept
+    sleep 0.1
+
+    env = @req.class.env_for "/queued/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_equal "0", headers["X-Current"], headers.inspect
+
+    env = @req.class.env_for "/active/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_equal "1", headers["X-Current"], headers.inspect
+  end
+
+  def test_peaks
+    env = @req.class.env_for "/active/#@addr.txt"
+    status, headers, body = @app.call(env.dup)
+    start = headers["X-First-Peak-At"]
+    assert headers["X-First-Peak-At"], headers.inspect
+    assert headers["X-Last-Peak-At"], headers.inspect
+    assert_nothing_raised { Time.parse(headers["X-First-Peak-At"]) }
+    assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
+    before = headers["X-Last-Peak-At"]
+
+    env = @req.class.env_for "/queued/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_nothing_raised { Time.parse(headers["X-First-Peak-At"]) }
+    assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
+    assert_equal before, headers["X-Last-Peak-At"], "should not change"
+
+    sleep 2
+    env = @req.class.env_for "/active/#@addr.txt"
+    status, headers, body = @app.call(env.dup)
+    assert_equal before, headers["X-Last-Peak-At"], headers.inspect
+
+    @ios << @srv.accept
+    assert_raises(Errno::EAGAIN) { @srv.accept_nonblock }
+    sleep 0.1
+    status, headers, body = @app.call(env.dup)
+    assert headers["X-Last-Peak-At"], headers.inspect
+    assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
+    assert before != headers["X-Last-Peak-At"]
+
+    queued_before = headers["X-Last-Peak-At"]
+
+    sleep 2
+
+    env = @req.class.env_for "/queued/#@addr.txt"
+    status, headers, body = @app.call(env)
+    assert_equal "0", headers["X-Current"]
+    assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
+    assert_equal queued_before, headers["X-Last-Peak-At"], "should not change"
+    assert_equal start, headers["X-First-Peak-At"]
+  end
 end if RUBY_PLATFORM =~ /linux/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 Z
+date: 2011-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler