raindrops 0.4.1 → 0.5.0

data/test/test_raindrops_gc.rb

@@ -13,4 +13,26 @@ class TestRaindropsGc < Test::Unit::TestCase
     end
   end
 
-end
+  def test_gc_postfork
+    tmp = Raindrops.new 2
+    pid = fork do
+      1000000.times do
+        tmp = Raindrops.new 2
+        tmp.to_ary
+      end
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+    assert_equal [ 0, 0 ], tmp.to_ary
+    tmp.incr 1
+    assert_equal [ 0, 1 ], tmp.to_ary
+    pid = fork do
+      tmp.incr 1
+      exit([ 0, 2 ] == tmp.to_ary)
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+    assert_equal [ 0, 2 ], tmp.to_ary
+  end
+end if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" &&
+       ENV["STRESS"].to_i != 0

data/test/test_watcher.rb

@@ -0,0 +1,85 @@
+# -*- encoding: binary -*-
+require "test/unit"
+require "rack"
+require "raindrops"
+
+class TestWatcher < Test::Unit::TestCase
+  TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+  def check_headers(headers)
+    %w(X-Count X-Std-Dev X-Min X-Max X-Mean
+       X-Outliers-Low X-Outliers-Low X-Last-Reset).each { |x|
+      assert_kind_of String, headers[x], "#{x} missing"
+    }
+  end
+
+  def teardown
+    @app.shutdown
+    @ios.each { |io| io.close unless io.closed? }
+  end
+
+  def setup
+    @ios = []
+    @srv = TCPServer.new TEST_ADDR, 0
+    @ios << @srv
+    @port = @srv.addr[1]
+    @client = TCPSocket.new TEST_ADDR, @port
+    @addr = "#{TEST_ADDR}:#{@port}"
+    @ios << @client
+    @app = Raindrops::Watcher.new :delay => 0.001
+    @req = Rack::MockRequest.new @app
+  end
+
+  def test_index
+    resp = @req.get "/"
+    assert_equal 200, resp.status.to_i
+    t = Time.parse resp.headers["Last-Modified"]
+    assert_in_delta Time.now.to_f, t.to_f, 2.0
+  end
+
+  def test_active_txt
+    resp = @req.get "/active/#@addr.txt"
+    assert_equal 200, resp.status.to_i
+    assert_equal "text/plain", resp.headers["Content-Type"]
+    check_headers(resp.headers)
+  end
+
+  def test_active_html
+    resp = @req.get "/active/#@addr.html"
+    assert_equal 200, resp.status.to_i
+    assert_equal "text/html", resp.headers["Content-Type"]
+    check_headers(resp.headers)
+  end
+
+  def test_reset
+    resp = @req.post "/reset/#@addr"
+    assert_equal 302, resp.status.to_i
+  end
+
+  def test_tail
+    env = @req.class.env_for "/tail/#@addr.txt"
+    status, headers, body = @app.call env
+    assert_equal "text/plain", headers["Content-Type"]
+    assert_equal 200, status.to_i
+    tmp = []
+    body.each do |x|
+      assert_kind_of String, x
+      tmp << x
+      break if tmp.size > 1
+    end
+  end
+
+  def test_tail_queued_min
+    env = @req.class.env_for "/tail/#@addr.txt?queued_min=1"
+    status, headers, body = @app.call env
+    assert_equal "text/plain", headers["Content-Type"]
+    assert_equal 200, status.to_i
+    tmp = []
+    body.each do |x|
+      tmp = TCPSocket.new TEST_ADDR, @port
+      @ios << tmp
+      assert_kind_of String, x
+      assert_equal 1, x.strip.split(/\s+/).last.to_i
+      break
+    end
+  end
+end if RUBY_PLATFORM =~ /linux/

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -15,15 +10,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +00:00
+date: 2011-03-17 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.10
+  type: :development
+  version_requirements: *id001
 description: |-
-  Raindrops is a real time stats package to show statistics for Rack HTTP
+  Raindrops is a real-time stats toolkit to show statistics for Rack HTTP
   servers.  It is designed for preforking servers such as Rainbows! and
   Unicorn, but should support any Rack HTTP server under Ruby 1.9, 1.8 and
-  possibly Rubinius (untested) on platforms supporting POSIX shared memory.
+  Rubinius on platforms supporting POSIX shared memory.  It may also be
+  used as a generic scoreboard for sharing atomic counters across multiple
+  processes.
 email: raindrops@librelist.com
 executables: []
 
@@ -35,51 +42,87 @@ extra_rdoc_files:
 - NEWS
 - ChangeLog
 - lib/raindrops.rb
+- lib/raindrops/aggregate.rb
+- lib/raindrops/aggregate/last_data_recv.rb
+- lib/raindrops/aggregate/pmq.rb
+- lib/raindrops/last_data_recv.rb
 - lib/raindrops/linux.rb
 - lib/raindrops/middleware.rb
+- lib/raindrops/middleware/proxy.rb
 - lib/raindrops/struct.rb
+- lib/raindrops/watcher.rb
+- ext/raindrops/raindrops.c
 - ext/raindrops/linux_inet_diag.c
+- ext/raindrops/linux_tcp_info.c
 files: 
 - .document
 - .gitignore
 - .manifest
+- .wrongdoc.yml
 - COPYING
 - ChangeLog
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- Gemfile
+- LATEST
 - LICENSE
 - NEWS
 - README
 - Rakefile
 - TODO
-- examples/config.ru
-- examples/linux-tcp-listener-stats.rb
+- examples/linux-listener-stats.rb
+- examples/middleware.ru
+- examples/watcher.ru
+- examples/watcher_demo.ru
+- examples/zbatery.conf.rb
 - ext/raindrops/extconf.rb
 - ext/raindrops/linux_inet_diag.c
+- ext/raindrops/linux_tcp_info.c
+- ext/raindrops/my_fileno.h
 - ext/raindrops/raindrops.c
 - ext/raindrops/raindrops_atomic.h
 - lib/raindrops.rb
+- lib/raindrops/aggregate.rb
+- lib/raindrops/aggregate/last_data_recv.rb
+- lib/raindrops/aggregate/pmq.rb
+- lib/raindrops/last_data_recv.rb
 - lib/raindrops/linux.rb
 - lib/raindrops/middleware.rb
+- lib/raindrops/middleware/proxy.rb
 - lib/raindrops/struct.rb
+- lib/raindrops/watcher.rb
+- pkg.mk
 - raindrops.gemspec
 - setup.rb
+- test/ipv6_enabled.rb
+- test/rack_unicorn.rb
+- test/test_aggregate_pmq.rb
+- test/test_inet_diag_socket.rb
+- test/test_last_data_recv_unicorn.rb
 - test/test_linux.rb
+- test/test_linux_all_tcp_listen_stats.rb
+- test/test_linux_all_tcp_listen_stats_leak.rb
+- test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
+- test/test_linux_tcp_info.rb
 - test/test_middleware.rb
+- test/test_middleware_unicorn.rb
+- test/test_middleware_unicorn_ipv6.rb
 - test/test_raindrops.rb
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
+- test/test_watcher.rb
 has_rdoc: true
 homepage: http://raindrops.bogomips.org/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- -Na
 - -t
 - raindrops - real-time stats for preforking Rack servers
+- -W
+- http://bogomips.org/raindrops.git/tree/%s
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -87,30 +130,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: real-time stats for preforking Rack servers
 test_files: 
+- test/test_aggregate_pmq.rb
+- test/test_inet_diag_socket.rb
+- test/test_last_data_recv_unicorn.rb
 - test/test_linux.rb
+- test/test_linux_all_tcp_listen_stats.rb
+- test/test_linux_all_tcp_listen_stats_leak.rb
+- test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
+- test/test_linux_tcp_info.rb
 - test/test_middleware.rb
+- test/test_middleware_unicorn.rb
+- test/test_middleware_unicorn_ipv6.rb
 - test/test_raindrops.rb
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
+- test/test_watcher.rb

data/examples/linux-tcp-listener-stats.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/ruby
-
-# this is used to show or watch the number of active and queued
-# connections on any listener socket from the command line
-
-require 'raindrops'
-require 'optparse'
-require 'ipaddr'
-usage = "Usage: #$0 [-d delay] ADDR..."
-ARGV.size > 0 or abort usage
-delay = false
-
-# "normal" exits when driven on the command-line
-trap(:INT) { exit 130 }
-trap(:PIPE) { exit 0 }
-
-opts = OptionParser.new('', 24, '  ') do |opts|
-  opts.banner = usage
-  opts.on('-d', '--delay=delay') { |nr| delay = nr.to_i }
-  opts.parse! ARGV
-end
-
-ARGV.each do |addr|
-  addr =~ %r{\A(127\..+):(\d+)\z} or next
-  host, port = $1, $2
-  hex_port = '%X' % port.to_i
-  ip_addr = IPAddr.new(host)
-  hex_host = ip_addr.hton.each_byte.inject('') { |s,o| s << '%02X' % o }
-  socks = File.readlines('/proc/net/tcp')
-  hex_addr = "#{hex_host}:#{hex_port}"
-  if socks.grep(/^\s+\d+:\s+#{hex_addr}\s+/).empty? &&
-     ! socks.grep(/^\s+\d+:\s+00000000:#{hex_port}\s+/).empty?
-    warn "W: #{host}:#{port} (#{hex_addr}) not found in /proc/net/tcp"
-    warn "W: Did you mean 0.0.0.0:#{port}?"
-  end
-end
-
-fmt = "% 19s % 10u % 10u\n"
-printf fmt.tr('u','s'), *%w(address active queued)
-
-begin
-  stats = Raindrops::Linux.tcp_listener_stats(ARGV)
-  stats.each { |addr,stats| printf fmt, addr, stats.active, stats.queued }
-end while delay && sleep(delay)