diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/yahns/fdmap.rb | 11 | ||||
| -rw-r--r-- | lib/yahns/server.rb | 3 | ||||
| -rw-r--r-- | lib/yahns/server_mp.rb | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/lib/yahns/fdmap.rb b/lib/yahns/fdmap.rb index fab5d36..0aaf360 100644 --- a/lib/yahns/fdmap.rb +++ b/lib/yahns/fdmap.rb @@ -89,10 +89,10 @@ class Yahns::Fdmap # :nodoc: # We should not be calling this too frequently, it is expensive # This is called while @fdmap_mtx is held def __expire(timeout) - return if @count == 0 + return 0 if @count == 0 nr = 0 now = Yahns.now - (now - @last_expire) >= 1.0 or return # don't expire too frequently + (now - @last_expire) >= 1.0 or return @count # don't expire too frequently # @fdmap_ary may be huge, so always expire a bunch at once to # avoid getting to this method too frequently @@ -104,8 +104,11 @@ class Yahns::Fdmap # :nodoc: end @last_expire = Yahns.now - msg = timeout ? "timeout=#{timeout}" : "client_timeout" - @logger.info("dropping #{nr} of #@count clients for #{msg}") + if nr != 0 + msg = timeout ? "timeout=#{timeout}" : "client_timeout" + @logger.info("dropping #{nr} of #@count clients for #{msg}") + end + @count end # used for graceful shutdown diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb index ba2066b..00e5f15 100644 --- a/lib/yahns/server.rb +++ b/lib/yahns/server.rb @@ -496,7 +496,8 @@ class Yahns::Server # :nodoc: def dropping(fdmap) if drop_acceptors[0] || fdmap.size > 0 timeout = @shutdown_expire < Yahns.now ? -1 : @shutdown_timeout - fdmap.desperate_expire(timeout) + n = fdmap.desperate_expire(timeout) + $0 = "yahns quitting, #{n} FD(s) remain" true else false diff --git a/lib/yahns/server_mp.rb b/lib/yahns/server_mp.rb index fa12a0c..c9cd207 100644 --- a/lib/yahns/server_mp.rb +++ b/lib/yahns/server_mp.rb @@ -159,7 +159,7 @@ module Yahns::ServerMP # :nodoc: def mp_sig_handle(watch, alive) # not performance critical watch.delete_if { |io| io.to_io.closed? } - if r = IO.select(watch, nil, nil, alive ? nil : 0.01) + if r = IO.select(watch, nil, nil, alive ? nil : 0.1) r[0].each(&:yahns_step) end case @sig_queue.shift |