diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-21 17:06:05 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-21 17:06:05 +0000 |
| commit | 6a7d389ed0bae2083b6608072fad34e64b3901d7 (patch) | |
| tree | 245f6f9d593a68823215e53a620ab8014e9633a0 /lib/drb/ssl.rb | |
| parent | 941b101e2200b0eabd738e40e7034d09109e0282 (diff) | |
| download | ruby-6a7d389ed0bae2083b6608072fad34e64b3901d7.tar.gz | |
* 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
Diffstat (limited to 'lib/drb/ssl.rb')
| -rw-r--r-- | lib/drb/ssl.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |