diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-03-27 17:26:03 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-03-27 17:26:03 -0700 |
commit | c83b5a903a076fda67c7d062da1ad6ff9337fdd1 (patch) | |
tree | c543d22f6227be5f373274a09a05b3ce237fe869 /test/unit/test_response.rb | |
parent | 9509f414a88281c93f0a1cb28123b8ae7538ee7f (diff) | |
download | unicorn-c83b5a903a076fda67c7d062da1ad6ff9337fdd1.tar.gz |
This reworks error handling throughout the entire stack to be more Ruby-ish. Exceptions are raised instead of forcing the us to check return values. If a client is sending us a bad request, we send a 400. If unicorn or app breaks in an unexpected way, we'll send a 500. Both of these last-resort error responses are sent using IO#write_nonblock to avoid tying Unicorn up longer than necessary and all exceptions raised are ignored. Sending a valid HTTP response back should reduce the chance of us from being marked as down or broken by a load balancer. Previously, some load balancers would mark us as down if we close a socket without sending back a valid response; so make a best effort to send one. If for some reason we cannot write a valid response, we're still susceptible to being marked as down. A successful HttpResponse.write() call will now close the socket immediately (instead of doing it higher up the stack). This ensures the errors will never get written to the socket on a successful response.
Diffstat (limited to 'test/unit/test_response.rb')
-rw-r--r-- | test/unit/test_response.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb index 4c7423b..62cabdf 100644 --- a/test/unit/test_response.rb +++ b/test/unit/test_response.rb @@ -22,7 +22,7 @@ class ResponseTest < Test::Unit::TestCase $, = "\f\v" out = StringIO.new HttpResponse.write(out,[200, {"X-Whatever" => "stuff"}, ["cool"]]) - resp = out.read + resp = out.string assert ! resp.include?("\f\v"), "output didn't use $, ($OFS)" ensure $, = old_ofs @@ -38,8 +38,9 @@ class ResponseTest < Test::Unit::TestCase code = 400 io = StringIO.new HttpResponse.write(io, [code, {}, []]) - io.rewind - assert_match(/.* #{HTTP_STATUS_CODES[code]}$/, io.readline.chomp, "wrong default reason phrase") + lines = io.string.split(/\r\n/) + assert_match(/.* #{HTTP_STATUS_CODES[code]}$/, lines.first, + "wrong default reason phrase") end def test_rack_multivalue_headers |