rainbows 4.5.0 → 4.6.0

data/.wrongdoc.yml

@@ -1,7 +1,7 @@
 ---
 cgit_url: http://bogomips.org/rainbows.git
 git_url: git://bogomips.org/rainbows.git
-rdoc_url: http://rainbows.rubyforge.org/
+rdoc_url: http://rainbows.bogomips.org/
 changelog_start: v0.97.0
 merge_html:
   rainbows_1: Documentation/rainbows.1.html

data/ChangeLog

@@ -1,5 +1,119 @@
-ChangeLog from http://bogomips.org/rainbows.git (v0.97.0..v4.5.0)
+ChangeLog from http://bogomips.org/rainbows.git (v0.97.0..v4.6.0)
 
+   commit 2dc55e417708d411987b4fb4233c87fe9f59ba0a
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Jan 17 20:13:42 2014 +0000
+   
+       Rainbows! 4.6.0 - fix unicorn 4.8.0 compatibility
+       
+       The unicorn 4.8.0 internal changes unfortunately broke some
+       unoffically supported behavior we depended on.  This release fixes
+       that, but as a result, we lose compatibility of older unicorn
+       versions.  (Oops!, oh well... :x)
+       
+       There's also minor bugfixes and documentation updates.
+       
+       In order to ease transitions to future versions of the GPL, we are
+       now "GPLv2 or later" instead of explicitly GPLv2 + GPLv3(-only).
+       The old Ruby 1.8 license remains an option.  If the FSF turns out
+       a horrible GPLv4, users are free to continue using GPLv2 or GPLv3.
+   
+   commit 169d506907a711254802a8e86cc343c6322dfae3
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Jan 17 20:25:06 2014 +0000
+   
+       switch homepage to http://rainbows.bogomips.org/
+       
+       RubyForge is going away, so we must migrate the homepage.
+       The mailing list will be migrated, soon.
+   
+   commit 3e701ee74ff29bdf5daa3249acede5a85a2b0097
+   Author: Eric Wong <e@80x24.org>
+   Date:   Fri Jan 17 02:03:04 2014 +0000
+   
+       unicorn 4.8 compatibility + test version bumps
+       
+       Internal reworking of unicorn 4.8.0 completely broke us(!).
+       This commit fixes things, but it means we no longer support
+       unicorn <= 4.7.  Sorry about that.
+   
+   commit 1b3e68e3eac0c3fbb2a32e4fddd26ee8a50ec627
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Jan 17 01:31:43 2014 +0000
+   
+       error: silence ETIMEDOUT and EHOSTUNREACH errors
+       
+       There's nothing we can do about these errors due to
+       network failures and bad clients, either, so do not spew
+       a backtrace for them.
+   
+   commit 877f44605ec1768e279843e36c214b656d191011
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Sat Oct 26 08:01:24 2013 +0000
+   
+       license: allow all future versions of the GNU GPL
+       
+       There is currently no GPLv4, so this change has no effect at the
+       moment.
+       
+       In case the GPLv4 arrives and I am not alive to approve/review it,
+       the lesser of evils is have give blanket approval of all future GPL
+       versions (as published by the FSF).  The worse evil is to be stuck
+       with a license which cannot guarantee the Free-ness of this project
+       in the future.
+       
+       This unfortunately means the FSF can theoretically come out with
+       license terms I do not agree with, but the GPLv2 and GPLv3 will
+       always be an option to all users.
+   
+   commit 008269885bcf1bbf99059d752970969f573d8867
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Sep 30 18:19:49 2013 +0000
+   
+       Rakefile: kill raa_update task
+       
+       RAA is dead.
+   
+   commit af09f23d530dd018bfd074a81d679a6ac815165e
+   Author: Lin Jen-Shin <godfat@godfat.org>
+   Date:   Fri Sep 13 00:41:16 2013 +0800
+   
+       Match against newer curl.
+       
+       My curl 7.32.0 would actually print 400 Bad Request
+       Hope this would make it match against newer or older curl.
+       
+       Signed-off-by: Eric Wong <normalperson@yhbt.net>
+   
+   commit d4988043825d1082666b4c219f2d66659b0c350b
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Sep 4 17:09:33 2013 +0000
+   
+       SIGNALS: document SIGHUP/preload_app incompatibility
+       
+       This was documented in the unicorn docs, but not Rainbows!
+       (The major difference between unicorn and Rainbows! signal
+       handling is the deferred handling of SIGUSR1 in unicorn vs
+       the immediate handling in Rainbows!)
+   
+   commit 45261c67658d57f98b51d6bb37890f03b60240a9
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Apr 24 23:08:32 2013 +0000
+   
+       test_isolate: update raindrops to 0.11.0
+       
+       raindrops 0.11.0 was released several days ago and contains
+       minor improvements + fixes.
+   
+   commit 2a39832fdbf8054c514562735b1ab6c6544065fe
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Mar 1 23:29:00 2013 +0000
+   
+       epoll+xepoll: clarify intent of these concurrency options
+       
+       Via private communication, I learned of a user using XEpoll
+       when he should not have been.
+   
    commit 4be3e386118969345ee5c94049efa7faae338e4d
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Wed Feb 27 10:25:21 2013 +0000

data/Documentation/rainbows.1.txt

@@ -155,7 +155,7 @@ RACKUP_FILE, some frameworks do not require them.
 * [Rack RDoc][2]
 * [Rackup HowTo][3]
 
-[1]: http://rainbows.rubyforge.org/
+[1]: http://rainbows.bogomips.org/
 [2]: http://rack.rubyforge.org/doc/
 [3]: http://wiki.github.com/rack/rack/tutorial-rackup-howto
-[4]: http://rainbows.rubyforge.org/SIGNALS.html
+[4]: http://rainbows.bogomips.org/SIGNALS.html

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 4.5.0
+GIT_VERSION = 4.6.0

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-DEF_VER = "v4.5.0"
+DEF_VER = "v4.6.0"
 CONSTANT = "Rainbows::Const::RAINBOWS_VERSION"
 RVF = "lib/rainbows/version.rb"
 GVF = "GIT-VERSION-FILE"

data/GNUmakefile

@@ -1,6 +1,7 @@
 # use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-RSYNC_DEST := rubyforge.org:/var/www/gforge-projects/rainbows
+# RSYNC_DEST := rubyforge.org:/var/www/gforge-projects/rainbows
+RSYNC_DEST := rainbows.bogomips.org:/srv/rainbows
 rfproject := rainbows
 rfpackage := rainbows
 
@@ -11,7 +12,6 @@ doc:: man-rdoc
 include pkg.mk
 ifneq ($(VERSION),)
 release::
-	$(RAKE) raa_update VERSION=$(VERSION)
 	$(RAKE) publish_news VERSION=$(VERSION)
 	$(RAKE) fm_update VERSION=$(VERSION)
 endif

data/LATEST

@@ -1,11 +1,17 @@
-=== Rainbows! 4.5.0 - hijacking support / 2013-02-27 10:28 UTC
+=== Rainbows! 4.6.0 - fix unicorn 4.8.0 compatibility / 2014-01-17 20:25 UTC
 
-  This release adds hijacking support for Rack 1.5.x users.
-  See Rack documentation for more information about hijacking.
-  Lin Jen-Shin also provided the -N/--no-default-middleware option.
-  Minor packaging cleanups and new HACKING document.
+  The unicorn 4.8.0 internal changes unfortunately broke some
+  unoffically supported behavior we depended on.  This release fixes
+  that, but as a result, we lose compatibility of older unicorn
+  versions.  (Oops!, oh well... :x)
 
-  There are also some corner-case bugfixes for *Epoll* users
-  (sleepy_penguin, these bugs do not affect EM or Cool.io users)
-  and test suite portability improvements.
+  There's also minor bugfixes and documentation updates.
+  The website is now at http://rainbows.bogomips.org/ since
+  RubyForge is shutting down.  The mailing list will be migrated
+  soon.
+
+  In order to ease transitions to future versions of the GPL, we are
+  now "GPLv2 or later" instead of explicitly GPLv2 + GPLv3(-only).
+  The old Ruby 1.8 license remains an option.  If the FSF turns out
+  a horrible GPLv4, users are free to continue using GPLv2 or GPLv3.
 

data/LICENSE

@@ -3,15 +3,17 @@ revision control for names and email addresses of all of them.
 
 You can redistribute it and/or modify it under either the terms of the
 GNU General Public License (GPL) as published by the Free Software
-Foundation (FSF), version {3.0}[http://www.gnu.org/licenses/gpl-3.0.txt]
-or version {2.0}[http://www.gnu.org/licenses/gpl-2.0.txt]
-or the Ruby-specific license terms (see below).
+Foundation (FSF), either version 2 of the License, or (at your option)
+any later version.  We currently prefer the GPLv3 or later for
+derivative works, but the GPLv2 is fine.
 
-The \Rainbows! project leader (Eric Wong) reserves the right to add future
-versions of the GPL (and no other licenses) as published by the FSF to
-the licensing terms.
+The complete texts of the GPLv2 and GPLv3 are below:
+GPLv2 - http://www.gnu.org/licenses/gpl-2.0.txt
+GPLv3 - http://www.gnu.org/licenses/gpl-3.0.txt
 
-=== Ruby-specific terms (if you're not using the GPLv2/GPLv3)
+You may (against our _preference_) also use the Ruby 1.8 license terms.
+
+=== Ruby 1.8-specific terms (if you're not using the GPLv2/GPLv3)
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the

data/NEWS

@@ -1,3 +1,20 @@
+=== Rainbows! 4.6.0 - fix unicorn 4.8.0 compatibility / 2014-01-17 20:25 UTC
+
+  The unicorn 4.8.0 internal changes unfortunately broke some
+  unoffically supported behavior we depended on.  This release fixes
+  that, but as a result, we lose compatibility of older unicorn
+  versions.  (Oops!, oh well... :x)
+
+  There's also minor bugfixes and documentation updates.
+  The website is now at http://rainbows.bogomips.org/ since
+  RubyForge is shutting down.  The mailing list will be migrated
+  soon.
+
+  In order to ease transitions to future versions of the GPL, we are
+  now "GPLv2 or later" instead of explicitly GPLv2 + GPLv3(-only).
+  The old Ruby 1.8 license remains an option.  If the FSF turns out
+  a horrible GPLv4, users are free to continue using GPLv2 or GPLv3.
+
 === Rainbows! 4.5.0 - hijacking support / 2013-02-27 10:28 UTC
 
   This release adds hijacking support for Rack 1.5.x users.

data/README

@@ -90,7 +90,7 @@ fast applications.
 == License
 
 \Rainbows! is copyright 2009,2010 by all contributors (see logs in git).
-\Rainbows! is licensed under the Ruby (1.8) license or the GPL (v2 or v3).
+\Rainbows! is licensed under the Ruby (1.8) license or the GPLv2 or later.
 See the included {LICENSE}[link:LICENSE.html] file for more details.
 
 \Rainbows! is 100% Free Software.

data/Rakefile

@@ -35,43 +35,6 @@ task :publish_news do
   rf.post_news('rainbows', subject, body)
 end
 
-desc "post to RAA"
-task :raa_update do
-  require 'net/http'
-  require 'net/netrc'
-  rc = Net::Netrc.locate('rainbows-raa') or abort "~/.netrc not found"
-  password = rc.password
-
-  s = Gem::Specification.load('rainbows.gemspec')
-  desc = [ s.description.strip ]
-  desc << ""
-  desc << "* #{s.email}"
-  desc << "* #{git_url}"
-  desc << "* #{cgit_url}"
-  desc = desc.join("\n")
-  uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml')
-  form = {
-    :name => s.name,
-    :short_description => s.summary,
-    :version => s.version.to_s,
-    :status => 'experimental',
-    :owner => s.authors.first,
-    :email => s.email,
-    :category_major => 'Library',
-    :category_minor => 'Web',
-    :url => s.homepage,
-    :download => "http://rubyforge.org/frs/?group_id=8977",
-    :license => "Ruby's",
-    :description_style => 'Plain',
-    :description => desc,
-    :pass => password,
-    :submit => "Update",
-  }
-  res = Net::HTTP.post_form(uri, form)
-  p res
-  puts res.body
-end
-
 desc "post to FM"
 task :fm_update do
   require 'net/http'

data/SIGNALS

@@ -10,6 +10,16 @@ between \Rainbows!, Unicorn and nginx.
 === Master Process
 
 * HUP - reload config file, app, and gracefully restart all workers
+  If the "preload_app" directive is false (the default), then workers
+  will also pick up any application code changes when restarted.  If
+  "preload_app" is true, then application code changes will have no
+  effect; USR2 + QUIT (see below) must be used to load newer code in
+  this case.  When reloading the application, +Gem.refresh+ will
+  be called so updated code for your application can pick up newly
+  installed RubyGems.  It is not recommended that you uninstall
+  libraries your application depends on while Rainbows! is running,
+  as respawned workers may enter a spawn loop when they fail to
+  load an uninstalled dependency.
 
 * INT/TERM - quick shutdown, kills all workers immediately
 

data/lib/rainbows/base.rb

@@ -8,24 +8,33 @@
 module Rainbows::Base
   # :stopdoc:
 
+  def sig_receiver(worker)
+    begin
+      worker.to_io.kgio_wait_readable
+      worker.kgio_tryaccept # Unicorn::Worker#kgio_tryaccept
+    rescue => e
+      Rainbows.alive or return
+      Unicorn.log_error(Rainbows.server.logger, "signal receiver", e)
+    end while true
+  end
+
   # this method is called by all current concurrency models
   def init_worker_process(worker) # :nodoc:
-    super(worker)
+    readers = super(worker)
     Rainbows::Response.setup
     Rainbows::MaxBody.setup
     Rainbows.worker = worker
 
-    # we're don't use the self-pipe mechanism in the Rainbows! worker
-    # since we don't defer reopening logs
-    Rainbows::HttpServer::SELF_PIPE.each { |x| x.close }.clear
-
     # spawn Threads since Logger takes a mutex by default and
     # we can't safely lock a mutex in a signal handler
     trap(:USR1) { Thread.new { reopen_worker_logs(worker.nr) } }
     trap(:QUIT) { Thread.new { Rainbows.quit! } }
     [:TERM, :INT].each { |sig| trap(sig) { exit!(0) } } # instant shutdown
     Rainbows::ProcessClient.const_set(:APP, Rainbows.server.app)
+    Thread.new { sig_receiver(worker) }
     logger.info "Rainbows! #@use worker_connections=#@worker_connections"
+    Rainbows.readers = readers # for Rainbows.quit
+    readers # unicorn 4.8+ needs this
   end
 
   def process_client(client)

data/lib/rainbows/epoll.rb

@@ -19,6 +19,8 @@ require 'sendfile'
 # small enough to always be in your kernel page cache.  This concurrency
 # model may starve clients if you have slow disks and large static files.
 #
+# Do not use this if you have slow external dependencies.
+#
 # === RubyGem Requirements
 #
 # * raindrops 0.6.0 or later

data/lib/rainbows/error.rb

@@ -25,7 +25,7 @@ module Rainbows::Error
   def self.response(e)
     case e
     when EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL,
-         Errno::EBADF, Errno::ENOTCONN
+         Errno::EBADF, Errno::ENOTCONN, Errno::ETIMEDOUT, Errno::EHOSTUNREACH
       # swallow error if client shuts down one end or disconnects
     when Unicorn::HttpParserError
       Rainbows::Const::ERROR_400_RESPONSE # try to tell the client they're bad

data/lib/rainbows/version.rb

@@ -1 +1 @@
-Rainbows::Const::RAINBOWS_VERSION = '4.5.0'
+Rainbows::Const::RAINBOWS_VERSION = '4.6.0'

data/lib/rainbows/xepoll.rb

@@ -7,6 +7,8 @@ require 'rainbows/epoll'
 # for Ruby 1.9 users as it can avoid accept()-scalability issues on
 # multicore machines with many worker processes.
 #
+# Do not use this if you have slow external dependencies.
+#
 # === RubyGem Requirements
 #
 # * raindrops 0.6.0 or later

data/lib/rainbows.rb

@@ -4,7 +4,7 @@ require 'unicorn'
 # the value passed to TCP_DEFER_ACCEPT actually matters in Linux 2.6.32+
 Unicorn::SocketHelper::DEFAULTS[:tcp_defer_accept] = 60
 
-# See http://rainbows.rubyforge.org/ for documentation
+# See http://rainbows.bogomips.org/ for documentation
 module Rainbows
   # :stopdoc:
   O = {}
@@ -55,6 +55,7 @@ module Rainbows
     attr_reader :alive
     attr_writer :worker
     attr_writer :forked
+    attr_writer :readers
   end
 
   def self.config!(mod, *opts)
@@ -88,7 +89,9 @@ module Rainbows
       @alive = false
       Rainbows::HttpParser.quit
       @expire = Time.now + (@server.timeout * 2.0)
-      Unicorn::HttpServer::LISTENERS.each { |s| s.close rescue nil }.clear
+      tmp = @readers.dup
+      @readers.clear
+      tmp.each { |s| s.close rescue nil }.clear
       @at_quit.each { |task| task.call }
     end
     false

data/rainbows.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<kgio>, ['~> 2.5'])
 
   # we need Unicorn for the HTTP parser and process management
-  # 4.6.0+ supports hijacking, 4.6.2 fixes the chunk parser (for Ruby 2.0.0)
-  s.add_dependency(%q<unicorn>, ["~> 4.6", ">= 4.6.2"])
+  # we need unicorn 4.8.0+ since we depend on undocumented/unsupported
+  # unicorn internals.
+  s.add_dependency(%q<unicorn>, ["~> 4.8"])
 
   s.add_development_dependency(%q<isolate>, "~> 3.1")
   s.add_development_dependency(%q<wrongdoc>, "~> 1.6")
@@ -57,5 +58,5 @@ Gem::Specification.new do |s|
 
   # We inherited the Ruby 1.8 license from Mongrel, so we're stuck with it.
   # GPLv3 is preferred.
-  s.licenses = ["GPLv2", "GPLv3", "Ruby 1.8"]
+  s.licenses = ["GPLv2+", "Ruby 1.8"]
 end

data/t/t0045-client_max_header_size.sh

@@ -60,7 +60,7 @@ t_begin "smallest HTTP/0.9 request works right" && {
 
 t_begin "HTTP/1.1 request fails" && {
 	curl -vsSf http://$listen/ > $tmp 2>&1 && die "unexpected curl success"
-	grep '400$' $tmp
+	grep '400\( Bad Request\)\?$' $tmp
 }
 
 t_begin "increase client_max_header_size on reload" && {

data/t/test_isolate.rb

@@ -16,14 +16,14 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.8.0'
+  gem 'kgio', '2.8.1'
   gem 'rack', '1.5.2'
   gem 'kcar', '0.4.0'
-  gem 'raindrops', '0.10.0'
-  gem 'unicorn', '4.6.2'
+  gem 'raindrops', '0.12.0'
+  gem 'unicorn', '4.8.0'
 
   if engine == "ruby"
-    gem 'sendfile', '1.1.0'
+    gem 'sendfile', '1.2.1'
     gem 'cool.io', '1.1.0'
 
     gem 'eventmachine', '1.0.0'
@@ -39,10 +39,10 @@ Isolate.now!(opts) do
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.1.0'
+    gem 'sleepy_penguin', '3.3.0'
 
     # is 2.6.32 new enough?
-    gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'
+    gem 'io_splice', '4.2.0' if `uname -r`.strip > '2.6.32'
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: !binary |-
   cmFpbmJvd3M=
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
@@ -64,12 +64,7 @@ dependencies:
         fj4=
       - !ruby/object:Gem::Version
         version: !binary |-
-          NC42
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          NC42LjI=
+          NC44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,12 +74,7 @@ dependencies:
         fj4=
       - !ruby/object:Gem::Version
         version: !binary |-
-          NC42
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          NC42LjI=
+          NC44
 - !ruby/object:Gem::Dependency
   name: !binary |-
     aXNvbGF0ZQ==
@@ -475,12 +465,10 @@ files:
 - t/worker-follows-master-to-death.ru
 - t/write-on-close.ru
 - vs_Unicorn
-homepage: http://rainbows.rubyforge.org/
+homepage: http://rainbows.bogomips.org/
 licenses:
 - !binary |-
-  R1BMdjI=
-- !binary |-
-  R1BMdjM=
+  R1BMdjIr
 - !binary |-
   UnVieSAxLjg=
 post_install_message: