summaryrefslogtreecommitdiff
path: root/lib/drb/unix.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-21 17:06:05 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-21 17:06:05 +0000
commit6a7d389ed0bae2083b6608072fad34e64b3901d7 (patch)
tree245f6f9d593a68823215e53a620ab8014e9633a0 /lib/drb/unix.rb
parent941b101e2200b0eabd738e40e7034d09109e0282 (diff)
* 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/unix.rb')
-rw-r--r--lib/drb/unix.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 4d245780a53..3fb8d0ecceb 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -98,10 +98,12 @@ module DRb
@socket.close
File.unlink(path) if @server_mode
@socket = nil
+ close_shutdown_pipe
end
def accept
- s = @socket.accept
+ s = accept_or_shutdown
+ return nil unless s
self.class.new(nil, s, @config)
end