From 6a7d389ed0bae2083b6608072fad34e64b3901d7 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 21 Sep 2014 17:06:05 +0000 Subject: * lib/drb/drb.rb: Support graceful shutdown. (DRbTCPSocket#initialize): Create a pipe for shutdown notification. (DRbTCPSocket#close): Invoke close_shutdown_pipe. (DRbTCPSocket#close_shutdown_pipe): New private method. (DRbTCPSocket#accept): Use accept_or_shutdown. (DRbTCPSocket#accept_or_shutdown): New private method which returns nil on shutdown. (DRbServer#stop_service): Use shutdown instead of Thread#kill. (DRbServer#run): Break infinite loop when main_loop returns nil. (DRbServer#main_loop): @protocol.accept may return nil. * lib/drb/ssl.rb: Follow above change. * lib/drb/unix.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/drb/ssl.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/drb/ssl.rb') diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index dd4df4e129..efd8271a78 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -322,7 +322,8 @@ module DRb def accept # :nodoc: begin while true - soc = @socket.accept + soc = accept_or_shutdown + return nil unless soc break if (@acl ? @acl.allow_socket?(soc) : true) soc.close end -- cgit v1.2.3