zbatery 0.3.1 → 0.4.0

data/ChangeLog

@@ -1,198 +1,26 @@
-ChangeLog from git://git.bogomips.org/zbatery.git (v0.1.1..v0.3.1)
+ChangeLog from git://git.bogomips.org/zbatery.git (v0.3.1..v0.4.0)
 
-    commit 7a3de46f4e5734c237e2bb731ee15c0c4bf0c099
+    commit f3aa4b5c01c9ff7d72c6ce5bfde398d556e15d5a
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sun Jul 11 02:57:56 2010 +0000
+    Date:   Thu Oct 28 09:44:45 2010 +0000
     
-        Zbatery v0.3.1 - quiet EOF errors from clients
+        Zbatery 0.4.0 - Rainbows! 1.0.x sync
         
-        Eric Wong (3):
-              update local.mk.sample for 0.3.0
-              Fix documentation generation
-              bump Rainbows! (and Unicorn) dependencies
+        This release syncs up with the latest from Rainbows! 1.0.x
+        and Unicorn 2.0.x
     
-    commit 6ef21bfb48fd813f084f509f525f490d66b41bc4
+    commit 7a01cae820a175c2f7fd85e43f2e06ec8174340d
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sun Jul 11 02:57:01 2010 +0000
+    Date:   Thu Oct 28 09:43:15 2010 +0000
     
-        bump Rainbows! (and Unicorn) dependencies
+        updates for Rainbows! 1.0.0
         
-        Unicorn 1.1.0 had constant resolution problems
-        with TeeInput
+        There are some internal API changes here.
     
-    commit a50a048a805e88c2ea01a1c8d0ad71391d3b11f8
+    commit c37172c8febcec7f8a491b6e229260ca607e14b0
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 10:09:54 2010 +0000
+    Date:   Sat Aug 28 20:03:57 2010 +0000
     
-        Fix documentation generation
+        bump dependencies on Unicorn + Rainbows!
         
-        .document needed to be updated for RDoc 2.5.x
-    
-    commit 35f28b9eeae69077003fc9d98779104d76da5531
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 09:58:53 2010 +0000
-    
-        update local.mk.sample for 0.3.0
-    
-    commit d4f095ed8ed0da4f190280eb957c14b3f5e9a2e9
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 09:56:27 2010 +0000
-    
-        Zbatery v0.3.0 - for newer Rainbows!
-        
-        Rainbows! v0.95.0 is more awesome than v0.94.0, so we've updated
-        ourselves to use it and be more awesome as well!
-    
-    commit 00f570d6c3363794ee4489fae17b05555b78b2cf
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 09:55:20 2010 +0000
-    
-        gemspec: small doc updates
-    
-    commit 59d3b3f6318a85e4d68592e1f7b992dd54832aa0
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 09:53:52 2010 +0000
-    
-        add additional tests for newish Rainbows! features
-    
-    commit bd6b2263869c271113577b88d526c7c2a6f1455d
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Jul 10 02:41:46 2010 -0700
-    
-        updates for Rainbows! 0.95.0
-        
-        Rainbows! 0.95.0 made some incompatible changes, so update
-        everything.  Unfortunately we have to avoid subclassing here.
-        Tests use isolate now.
-    
-    commit 5764336aa3785af8a08be7ec7b40846ec139eb6c
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Apr 19 14:14:46 2010 -0700
-    
-        Zbatery 0.2.1 - use a less-broken parser from Unicorn
-        
-        This release fixes a denial-of-service vector for deployments
-        exposed directly to untrusted clients.
-        
-        The HTTP parser in Unicorn <= 0.97.0 would trip an assertion
-        (killing the associated worker process) on invalid
-        Content-Length headers instead of raising an exception.  Since
-        Rainbows! and Zbatery supports multiple clients per worker
-        process, all clients connected to the worker process that hit
-        the assertion would be aborted.
-        
-        Deployments behind nginx are _not_ affected by this bug, as
-        nginx will reject clients that send invalid Content-Length
-        headers.
-        
-        The status of deployments behind other HTTP-aware proxies is
-        unknown.  Deployments behind a non-HTTP-aware proxy (or no proxy
-        at all) are certainly affected by this DoS.
-        
-        Users are strongly encouraged to upgrade as soon as possible,
-        there are no other changes besides this bug fix from Rainbows!
-        0.91.0 nor Unicorn 0.97.0
-        
-        This bug affects all previously released versions of Rainbows!
-        and Zbatery.
-    
-    commit bf277616bf1a13385150260c8bccb1d97b830bec
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 18:22:14 2010 +0000
-    
-        t0003: fix error log check
-        
-        We don't have "worker" processes in here.
-    
-    commit 816d4e840fca8606215a328beda90dd92153bcd7
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 10:40:51 2010 +0000
-    
-        Zbatery 0.2.0 - Unicorn/Rainbows! resync
-        
-        Eric Wong (7):
-              use Unicorn.builder to parse config.ru switches
-              import selected parts of test suite from Rainbows!
-              gemspec: depend on newer Unicorn for Unicorn.builder
-              support "user" directive outside of after_fork hook
-              MRI 1.8 thread fix to avoid blocking accept()
-              disable more Unicorn methods
-              support Unicorn 0.96.0+ ready_pipe daemonization
-    
-    commit cdec2a634c85b92aa95d4c1f0ce2a056e332dfca
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 10:36:54 2010 +0000
-    
-        support Unicorn 0.96.0+ ready_pipe daemonization
-        
-        ready_pipe allows the controlling process to detect
-        errors more reliably.
-    
-    commit 98d605423b3a563de7b2d0b5f37695a4cf5bed7a
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 10:33:41 2010 +0000
-    
-        disable more Unicorn methods
-        
-        init_self_pipe! and trap_deferred are worthless and
-        possibly harmful to us
-    
-    commit 7dde8d1402a44e2997fa86ff5e3cf89c4ca6d82a
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 10:29:01 2010 +0000
-    
-        MRI 1.8 thread fix to avoid blocking accept()
-        
-        Rainbows! commit ee7fe220ccbc991e1e7cbe982caf48e3303274c7
-        
-        Under MRI 1.8, listen sockets do not appear to have the
-        nonblocking I/O flag on by default, nor does it set the
-        nonblocking I/O flag when calling #accept (but it does
-        when using #accept_nonblock, of course).
-        
-        Normally this is not a problem even when using green threads
-        since MRI will internally select(2) on the file descriptor
-        before attempting a blocking (and immediately successful)
-        accept(2).
-        
-        However, when sharing a listen descriptor across multiple
-        processes, spurious wakeups are likely to occur, causing
-        multiple processes may be woken up when a single client
-        connects.
-        
-        This causes a problem because accept(2)-ing on multiple
-        threads/processes for a single connection causes blocking accepts in
-        multiple processes, leading to stalled green threads.
-        
-        This is not an issue under 1.9 where a blocking accept() call
-        unlocks the GVL to let other threads run.
-    
-    commit 168bacbea266baecafe72adc1d7fa08674607744
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 10:20:32 2010 +0000
-    
-        support "user" directive outside of after_fork hook
-        
-        This is new in Unicorn 0.97.0, and makes sense to us since we
-        don't fork.  It won't work as nicely with log reopening in some
-        cases, but it's better than nothing
-    
-    commit 796b2db10446ff263e419b1009f854ca6afa4fe4
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 09:23:29 2010 +0000
-    
-        gemspec: depend on newer Unicorn for Unicorn.builder
-    
-    commit 9dc37425107195530b30af80ed9aa1ad72c9be94
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Mar 1 08:27:36 2010 +0000
-    
-        import selected parts of test suite from Rainbows!
-    
-    commit 5682d2879258f3ca06b28d4a1a7671b20f676dac
-    Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sun Feb 28 19:43:06 2010 -0800
-    
-        use Unicorn.builder to parse config.ru switches
-        
-        Less code to maintain this way.
+        Small fixes from both that are worth having to ease support.

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.3.1
+GIT_VERSION = 0.4.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -62,7 +62,7 @@ NEWS: GIT-VERSION-FILE
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.1.1
+SINCE = 0.3.1
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)

data/NEWS

@@ -1,3 +1,8 @@
+=== 0.4.0 / 2010-10-28 09:45 UTC
+
+  This release syncs up with the latest from Rainbows! 1.0.x
+  and Unicorn 2.0.x and includes minor bugfixes from both.
+
 === 0.3.1 / 2010-07-11 02:58 UTC
 
   Eric Wong (3):

data/bin/zbatery

@@ -1,20 +1,17 @@
-#!/usr/bin/ruby
+#!/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby
 # -*- encoding: binary -*-
 require 'unicorn/launcher'
 require 'zbatery'
 require 'optparse'
 
 ENV["RACK_ENV"] ||= "development"
-daemonize = false
-listeners = []
-options = { :listeners => listeners }
-host, port = Unicorn::Const::DEFAULT_HOST, Unicorn::Const::DEFAULT_PORT
-set_listener = false
+rackup_opts = Unicorn::Configurator::RACKUP
+options = rackup_opts[:options]
 
 opts = OptionParser.new("", 24, '  ') do |opts|
-  opts.banner = "Usage: #{File.basename($0)} " \
-                "[ruby options] [zbatery options] [rackup config file]"
-
+  cmd = File.basename($0)
+  opts.banner = "Usage: #{cmd} " \
+                "[ruby options] [#{cmd} options] [rackup config file]"
   opts.separator "Ruby options:"
 
   lineno = 1
@@ -41,34 +38,34 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     require library
   end
 
-  opts.separator "Zbatery options:"
+  opts.separator "#{cmd} options:"
 
   # some of these switches exist for rackup command-line compatibility,
 
   opts.on("-o", "--host HOST",
           "listen on HOST (default: #{Unicorn::Const::DEFAULT_HOST})") do |h|
-    host = h
-    set_listener = true
+    rackup_opts[:host] = h
+    rackup_opts[:set_listener] = true
   end
 
   opts.on("-p", "--port PORT",
           "use PORT (default: #{Unicorn::Const::DEFAULT_PORT})") do |p|
-    port = p.to_i
-    set_listener = true
+    rackup_opts[:port] = p.to_i
+    rackup_opts[:set_listener] = true
   end
 
-  opts.on("-E", "--env ENVIRONMENT",
-          "use ENVIRONMENT for defaults (default: development)") do |e|
+  opts.on("-E", "--env RACK_ENV",
+          "use RACK_ENV for defaults (default: development)") do |e|
     ENV["RACK_ENV"] = e
   end
 
   opts.on("-D", "--daemonize", "run daemonized in the background") do |d|
-    daemonize = d ? true : false
+    rackup_opts[:daemonize] = !!d
   end
 
   opts.on("-P", "--pid FILE", "DEPRECATED") do |f|
-    warn %q{Use of --pid/-P is strongly discouraged}
-    warn %q{Use the 'pid' directive in the Zbatery config file instead}
+    warn "Use of --pid/-P is strongly discouraged"
+    warn "Use the 'pid' directive in the Zbatery config file instead"
     options[:pid] = f
   end
 
@@ -77,15 +74,15 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     warn "-s/--server only exists for compatibility with rackup"
   end
 
-  # Zbatery/Unicorn-specific stuff
+  # Rainbows!/Unicorn-specific stuff
   opts.on("-l", "--listen {HOST:PORT|PATH}",
           "listen on HOST:PORT or PATH",
           "this may be specified multiple times",
           "(default: #{Unicorn::Const::DEFAULT_LISTEN})") do |address|
-    listeners << address
+    options[:listeners] << address
   end
 
-  opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f|
+  opts.on("-c", "--config-file FILE", "Zbatery-specific config file") do |f|
     options[:config_file] = f
   end
 
@@ -102,27 +99,23 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on_tail("-v", "--version", "Show version") do
-    puts "zbatery v#{Zbatery::VERSION}"
+    puts "Zbatery v#{Zbatery::VERSION}"
     exit
   end
 
   opts.parse! ARGV
 end
 
-config = ARGV[0] || "config.ru"
-abort "configuration file #{config} not found" unless File.exist?(config)
-
-app = Unicorn.builder(config, opts)
-listeners << "#{host}:#{port}" if set_listener
+app = Unicorn.builder(ARGV[0] || 'config.ru', opts)
 
 if $DEBUG
   require 'pp'
   pp({
-    :zbatery_options => options,
+    :unicorn_options => options,
     :app => app,
-    :daemonize => daemonize,
+    :daemonize => rackup_opts[:daemonize],
   })
 end
 
-Unicorn::Launcher.daemonize!(options) if daemonize
+Unicorn::Launcher.daemonize!(options) if rackup_opts[:daemonize]
 Zbatery.run(app, options)

data/lib/zbatery.rb

@@ -4,8 +4,8 @@ require 'rainbows'
 
 module Zbatery
 
-  # current version of Zbatery
-  VERSION = "0.3.1"
+  # version of Zbatery, currently 0.4.0
+  VERSION = "0.4.0"
 
   class << self
 
@@ -18,21 +18,10 @@ module Zbatery
 
   Rainbows::Const::RACK_DEFAULTS["SERVER_SOFTWARE"] = "Zbatery #{VERSION}"
 
-  # true if our Ruby implementation supports unlinked files
-  UnlinkedIO = begin
-    tmp = Unicorn::Util.tmpio
-    tmp.chmod(0)
-    tmp.close
-    true
-  rescue
-    false
-  end
-
   # we don't actually fork workers, but allow using the
   # {before,after}_fork hooks found in Unicorn/Rainbows!
   # config files...
   FORK_HOOK = lambda { |_,_| }
-
 end
 
 # :stopdoc:
@@ -47,12 +36,7 @@ module Rainbows
       build_app! unless preload_app
       Rainbows::Response.setup(self.class)
       Rainbows::MaxBody.setup
-
-      # avoid spurious wakeups and blocking-accept() with 1.8 green threads
-      if RUBY_VERSION.to_f < 1.9
-        require "io/nonblock"
-        HttpServer::LISTENERS.each { |l| l.nonblock = true }
-      end
+      Rainbows::ProcessClient.const_set(:APP, @app)
 
       logger.info "Zbatery #@use worker_connections=#@worker_connections"
     end
@@ -68,6 +52,7 @@ module Rainbows
     # this class is only used to avoid breaking Unicorn user switching
     class DeadIO
       def chown(*args); end
+      alias fcntl chown
     end
 
     # only used if no concurrency model is specified
@@ -75,11 +60,8 @@ module Rainbows
       init_worker_process(worker)
       begin
         ret = IO.select(LISTENERS, nil, nil, nil) and
-        ret.first.each do |sock|
-          begin
-            process_client(sock.accept_nonblock)
-          rescue Errno::EAGAIN, Errno::ECONNABORTED
-          end
+        ret[0].each do |sock|
+          io = sock.kgio_tryaccept and process_client(io)
         end
       rescue Errno::EINTR
       rescue Errno::EBADF, TypeError
@@ -108,32 +90,24 @@ module Rainbows
     end
 
     def join
-      begin
-        trap(:INT) { stop(false) } # Mongrel trapped INT for Win32...
-
-        # try these anyways regardless of platform...
-        trap(:TERM) { stop(false) }
-        trap(:QUIT) { stop }
-        trap(:USR1) { reopen_logs }
-        trap(:USR2) { reexec }
-
-        # no other way to reliably switch concurrency models...
-        trap(:HUP) { reexec; stop }
-
-        # technically feasible in some cases, just not sanely supportable:
-        %w(TTIN TTOU WINCH).each do |sig|
-          trap(sig) { logger.info "SIG#{sig} is not handled by Zbatery" }
-        end
-      rescue => e # hopefully ignores errors on Win32...
-        logger.error "failed to setup signal handler: #{e.message}"
+      trap(:INT) { stop(false) }
+      trap(:TERM) { stop(false) }
+      trap(:QUIT) { stop }
+      trap(:USR1) { reopen_logs }
+      trap(:USR2) { reexec }
+      trap(:HUP) { reexec; stop }
+
+      # technically feasible in some cases, just not sanely supportable:
+      %w(TTIN TTOU WINCH).each do |sig|
+        trap(sig) { logger.info "SIG#{sig} is not handled by Zbatery" }
       end
 
       if ready_pipe
         ready_pipe.syswrite($$.to_s)
-        ready_pipe.close rescue nil
+        ready_pipe.close
         self.ready_pipe = nil
       end
-
+      extend(Rainbows.const_get(@use))
       worker = Worker.new(0, DeadIO.new)
       before_fork.call(self, worker)
       worker_loop(worker) # runs forever
@@ -160,24 +134,5 @@ module Rainbows
   end
 end
 
-module Unicorn
-
-  class Configurator
-    DEFAULTS[:before_fork] = DEFAULTS[:after_fork] = Zbatery::FORK_HOOK
-  end
-
-  unless Zbatery::UnlinkedIO
-    require 'tempfile'
-    class Util
-
-      # Tempfiles should get automatically unlinked by GC
-      def self.tmpio
-        fp = Tempfile.new("zbatery")
-        fp.binmode
-        fp.sync = true
-        fp
-      end
-    end
-  end
-
-end
+Unicorn::Configurator::DEFAULTS[:before_fork] =
+  Unicorn::Configurator::DEFAULTS[:after_fork] = Zbatery::FORK_HOOK

data/t/test_isolate.rb

@@ -14,9 +14,9 @@ old_out = $stdout.dup
 $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
-  gem 'rack', '1.1.0'
-  gem 'unicorn', '1.1.1'
-  gem 'rainbows', '0.95.1'
+  gem 'rack', '1.2.1'
+  gem 'unicorn', '2.0.0'
+  gem 'rainbows', '1.0.0'
 
   if engine == "ruby"
     gem 'sendfile', '1.0.0' # next Rubinius should support this
@@ -29,7 +29,6 @@ Isolate.now!(opts) do
     gem 'async_sinatra', '0.2.1'
 
     gem 'neverblock', '0.1.6.2'
-    gem 'cramp', '0.11'
   end
 
   if defined?(::Fiber) && engine == "ruby"

data/zbatery.gemspec

@@ -50,12 +50,8 @@ Gem::Specification.new do |s|
   #   espace-neverblock + eventmachine
   #   async_sinatra + sinatra + eventmachine
   #
-  # rainbows 0.91.1 depends on unicorn ~> 0.97.1, previous versions of
-  # Unicorn were vulnerable to a remote DoS when exposed directly to
-  # untrusted clients (a configuration only supported by Zbatery and Rainbows!,
-  # Unicorn has never and will never be supported without trusted LAN clients.
-  s.add_dependency(%q<rainbows>, [">= 0.95.1", "<= 1.0.0"])
-  s.add_development_dependency(%q<isolate>, "~> 2.1.0")
+  s.add_dependency(%q<rainbows>, ["~> 1.0.0"])
+  s.add_development_dependency(%q<isolate>, "~> 3.0.0")
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbatery
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Zbatery hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 +00:00
+date: 2010-10-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 353
-        segments: 
-        - 0
-        - 95
-        - 1
-        version: 0.95.1
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -50,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
-        - 1
+        - 3
+        - 0
         - 0
-        version: 2.1.0
+        version: 3.0.0
   type: :development
   version_requirements: *id002
 description: |-