From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: rainbows-public@bogomips.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 94071633807 for ; Tue, 24 Nov 2015 23:05:20 +0000 (UTC) From: Eric Wong To: rainbows-public@bogomips.org Subject: [PATCH] fix broken constant lookups in unmaintained bits Date: Tue, 24 Nov 2015 23:05:20 +0000 Message-Id: <20151124230520.29933-1-e@80x24.org> List-Id: In case Revactor starts being maintained again... (heck, it was probably the reason I started Rainbows! in the first place...) Our ReverseProxy stuff was never complete nor marketed; and probably not worth keeping around at all. --- lib/rainbows/revactor/client.rb | 2 +- lib/rainbows/revactor/proxy.rb | 2 +- lib/rainbows/reverse_proxy/coolio.rb | 6 +++--- lib/rainbows/reverse_proxy/event_machine.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/rainbows/revactor/client.rb b/lib/rainbows/revactor/client.rb index 5b1e52d..c24b137 100644 --- a/lib/rainbows/revactor/client.rb +++ b/lib/rainbows/revactor/client.rb @@ -32,7 +32,7 @@ def timed_read(buf2) end def set_input(env, hp) - env[RACK_INPUT] = 0 == hp.content_length ? + env['rack.input'] = 0 == hp.content_length ? NULL_IO : IC.new(@ts = TeeSocket.new(@client), hp) end diff --git a/lib/rainbows/revactor/proxy.rb b/lib/rainbows/revactor/proxy.rb index 4715981..6bac7d5 100644 --- a/lib/rainbows/revactor/proxy.rb +++ b/lib/rainbows/revactor/proxy.rb @@ -22,7 +22,7 @@ def each # (instead of Errno::EPIPE), so we need to limit the rescue # to just readpartial and let EOFErrors during yield bubble up begin - buf = readpartial(INPUT_SIZE) + buf = readpartial(16384) rescue EOFError break end while yield(buf) || true diff --git a/lib/rainbows/reverse_proxy/coolio.rb b/lib/rainbows/reverse_proxy/coolio.rb index 2a977e0..86f2b79 100644 --- a/lib/rainbows/reverse_proxy/coolio.rb +++ b/lib/rainbows/reverse_proxy/coolio.rb @@ -32,20 +32,20 @@ def on_readable when :wait_readable return when nil - @env[AsyncCallback].call(@response) + @env['async.callback'].call(@response) return close end while true # we always read until EAGAIN or EOF rescue => e case e when Errno::ECONNRESET - @env[AsyncCallback].call(@response) + @env['async.callback'].call(@response) return close when SystemCallError else Unicorn.log_error(@env["rack.logger"], "on_readable", e) end - @env[AsyncCallback].call(Rainbows::ReverseProxy::E502) + @env['async.callback'].call(Rainbows::ReverseProxy::E502) close end end diff --git a/lib/rainbows/reverse_proxy/event_machine.rb b/lib/rainbows/reverse_proxy/event_machine.rb index 8cb382c..d92254d 100644 --- a/lib/rainbows/reverse_proxy/event_machine.rb +++ b/lib/rainbows/reverse_proxy/event_machine.rb @@ -30,7 +30,7 @@ def on_write_complete end def unbind - @env[AsyncCallback].call(@response || Rainbows::ReverseProxy::E502) + @env['async.callback'].call(@response || Rainbows::ReverseProxy::E502) end end -- EW