diff options
author | Simon Eskildsen <simon.eskildsen@shopify.com> | 2017-03-06 16:32:02 -0500 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2017-03-08 00:24:22 +0000 |
commit | 9a9bd739e555771cacfd5b3757a251754ef9512b (patch) | |
tree | 2a2f17b3560530fcba6b470b6316216ae87b82bb /lib/unicorn/oob_gc.rb | |
parent | 73e1ce827faad59bfcaff0bc758c8255a5e4f747 (diff) | |
download | unicorn-9a9bd739e555771cacfd5b3757a251754ef9512b.tar.gz |
* Use a frozen empty array and a class variable for TCP_Info to avoid garbage. As far as I can tell, this shouldn't result in any garbage on any requests (other than on the first request). * Pass listener socket to #read to only check the client connection on a TCP server. * Short circuit CLOSE_WAIT after ESTABLISHED since in my testing it's the most common state after ESTABLISHED, it makes the numbers un-ordered, though. But comment should make it OK. * Definition of of `check_client_connection` based on whether Raindrops::TCP_Info is defined, instead of the class variable approach. * Changed the unit tests to pass a `nil` listener. Tested on our staging environment, and still works like a dream. I should note that I got the idea between this patch into Puma as well! https://github.com/puma/puma/pull/1227 [ew: squashed in temporary change for oob_gc.rb, but we'll come up with a different change to avoid breaking gctools <https://github.com/tmm1/gctools>] Acked-by: Eric Wong <e@80x24.org>
Diffstat (limited to 'lib/unicorn/oob_gc.rb')
-rw-r--r-- | lib/unicorn/oob_gc.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/unicorn/oob_gc.rb b/lib/unicorn/oob_gc.rb index 5572e59..74a1d51 100644 --- a/lib/unicorn/oob_gc.rb +++ b/lib/unicorn/oob_gc.rb @@ -67,8 +67,8 @@ module Unicorn::OobGC #:stopdoc: PATH_INFO = "PATH_INFO" - def process_client(client) - super(client) # Unicorn::HttpServer#process_client + def process_client(client, listener) + super(client, listener) # Unicorn::HttpServer#process_client if OOBGC_PATH =~ OOBGC_ENV[PATH_INFO] && ((@@nr -= 1) <= 0) @@nr = OOBGC_INTERVAL OOBGC_ENV.clear |