From: Eric Wong <normalperson-rMlxZR9MS24@public.gmane.org>
To: Rainbows! list <rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org>
Subject: Re: [ANN] Rainbows! 4.0.0 - MOAR concurrency for MOAR COARS
Date: Wed, 29 Jun 2011 07:19:05 +0000 [thread overview]
Message-ID: <20110629071905.GA6838@dcvr.yhbt.net> (raw)
In-Reply-To: <20110629071101.GA8110-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
Eric Wong <normalperson-rMlxZR9MS24@public.gmane.org> wrote:
> ghazel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org wrote:
> > I can't seem to upgrade from rainbows-3.4.0 to rainbows-4.0.0. I see:
> >
> > #<NoMethodError: undefined method `expand_addr' for nil:NilClass>
>
> That's odd, what configuration options and Ruby version are you
> using? Are you using a per-worker listen socket?
This should fix it, the test case for this was broken, too :<
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 02ba965..78d80b4 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -453,7 +453,7 @@ class Unicorn::HttpServer
def after_fork_internal
@ready_pipe.close if @ready_pipe
Unicorn::Configurator::RACKUP.clear
- @ready_pipe = @init_listeners = @config = @before_exec = @before_fork = nil
+ @ready_pipe = @init_listeners = @before_exec = @before_fork = nil
srand # http://redmine.ruby-lang.org/issues/4338
@@ -545,6 +545,7 @@ class Unicorn::HttpServer
after_fork.call(self, worker) # can drop perms
worker.user(*user) if user.kind_of?(Array) && ! worker.switched
self.timeout /= 2.0 # halve it for select()
+ @config = nil
build_app! unless preload_app
end
diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb
index 0f6b083..8c33457 100644
--- a/test/exec/test_exec.rb
+++ b/test/exec/test_exec.rb
@@ -516,7 +516,7 @@ EOF
File.unlink(tmp.path)
ucfg = Tempfile.new('unicorn_test_config')
ucfg.syswrite("listen '#@addr:#@port'\n")
- ucfg.syswrite("before_fork { |s,w|\n")
+ ucfg.syswrite("after_fork { |s,w|\n")
ucfg.syswrite(" s.listen('#{tmp.path}', :backlog => 5, :sndbuf => 8192)\n")
ucfg.syswrite(" s.listen('#@addr:#{port2}', :rcvbuf => 8192)\n")
ucfg.syswrite("\n}\n")
--
Eric Wong
_______________________________________________
Rainbows! mailing list - rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org
http://rubyforge.org/mailman/listinfo/rainbows-talk
Do not quote signatures (like this one) or top post when replying
prev parent reply other threads:[~2011-06-29 7:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-27 9:45 [ANN] Rainbows! 4.0.0 - MOAR concurrency for MOAR COARS Eric Wong
[not found] ` <20110627094517.GA27156-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2011-06-29 6:36 ` ghazel-Re5JQEeQqe8AvxtiuMwx3w
[not found] ` <BANLkTi=oQXK5Casq9SuGD3edeUrDPvRm3A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-06-29 7:11 ` Eric Wong
[not found] ` <20110629071101.GA8110-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2011-06-29 7:16 ` ghazel-Re5JQEeQqe8AvxtiuMwx3w
[not found] ` <BANLkTi=SRC7EvrA5tZcwJhwNKzgtyvz5mg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-06-29 7:31 ` Eric Wong
[not found] ` <20110629073103.GB10100-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2011-06-29 7:47 ` ghazel-Re5JQEeQqe8AvxtiuMwx3w
2011-06-29 7:19 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/rainbows/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110629071905.GA6838@dcvr.yhbt.net \
--to=normalperson-rmlxzr9ms24@public.gmane.org \
--cc=rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/rainbows.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).