[PATCH 0/3] preparing for raindrops 0.10.0

[PATCH 0/3] preparing for raindrops 0.10.0

[Eric Wong]

A few more minor changes pushed to master of git://bogomips.org/raindrops

Eric Wong (3):
      test_watcher: fix incorrect request/date comparison
      watcher: sort index of listener listing
      watcher: do not require Rack::Head for HEAD response

Feedback/comments greatly appreciated.  I'll probably tag the release
tonight if everything goes well.

[PATCH 1/3] test_watcher: fix incorrect request/date comparison

[Eric Wong]

It makes no sense to compare peak times of different queues
(active vs queued) against each other.
---
 test/test_watcher.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test_watcher.rb b/test/test_watcher.rb
index 056a3bf..5e45dcd 100644
--- a/test/test_watcher.rb
+++ b/test/test_watcher.rb
@@ -156,6 +156,7 @@ class TestWatcher < Test::Unit::TestCase
     @ios << @srv.accept
     assert_raises(Errno::EAGAIN) { @srv.accept_nonblock }
     sleep 0.1
+    env = @req.class.env_for "/queued/#@addr.txt"
     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"]) }
-- 
1.7.11.rc0.55.gb2478aa

[PATCH 2/3] watcher: sort index of listener listing

[Eric Wong]

For hosts with many listeners, it should be easier to read the
index page if the results are shown in a consistent order.

Requested privately via email to raindrops@bogomips.org
---
 lib/raindrops/watcher.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/raindrops/watcher.rb b/lib/raindrops/watcher.rb
index 869fa17..5493374 100644
--- a/lib/raindrops/watcher.rb
+++ b/lib/raindrops/watcher.rb
@@ -337,7 +337,9 @@ class Raindrops::Watcher
       "<table><tr>" \
         "<th>address</th><th>active</th><th>queued</th><th>reset</th>" \
       "</tr>" <<
-      all.map do |addr,stats|
+      all.sort do |a,b|
+        a[0] <=> b[0] # sort by addr
+      end.map do |addr,stats|
         e_addr = escape addr
         "<tr>" \
           "<td><a href='/tail/#{e_addr}.txt' " \
-- 
1.7.11.rc0.55.gb2478aa

[PATCH 3/3] watcher: do not require Rack::Head for HEAD response

[Eric Wong]

Rack webservers are not guaranteed to include Rack::Head in the
middleware stack.  Watcher is a standalone app, so it cannot
rely on a framework which automatically includes Rack::Head.
---
 lib/raindrops/watcher.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/raindrops/watcher.rb b/lib/raindrops/watcher.rb
index 5493374..43c30ef 100644
--- a/lib/raindrops/watcher.rb
+++ b/lib/raindrops/watcher.rb
@@ -143,8 +143,12 @@ class Raindrops::Watcher
   def call(env)
     @start.synchronize { @thr ||= aggregator_thread(env["rack.logger"]) }
     case env["REQUEST_METHOD"]
-    when "HEAD", "GET"
+    when "GET"
       get env
+    when "HEAD"
+      r = get(env)
+      r[2] = []
+      r
     when "POST"
       post env
     else
-- 
1.7.11.rc0.55.gb2478aa