diff options
Diffstat (limited to 'lib/drb')
| -rw-r--r-- | lib/drb/drb.rb | 15 | ||||
| -rw-r--r-- | lib/drb/extserv.rb | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index a3abd45116..0fb791e3f7 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1352,7 +1352,11 @@ module DRb # Stop this server. def stop_service - @thread.kill + if Thread.current['DRb'] && Thread.current['DRb']['server'] == self + Thread.current['DRb']['stop_service'] = true + else + @thread.kill + end end # Convert a dRuby reference to the local object it refers to. @@ -1556,10 +1560,11 @@ module DRb end client.send_reply(succ, result) rescue nil ensure - unless succ - client.close - break - end + client.close unless succ + if Thread.current['DRb']['stop_service'] + Thread.new { stop_service } + end + break unless succ end end end diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb index 4ed2913051..7da8130c2b 100644 --- a/lib/drb/extserv.rb +++ b/lib/drb/extserv.rb @@ -25,10 +25,7 @@ module DRb @invoker.unregist(@name) server = @server @server = nil - Thread.new do - sleep 1 - server.stop_service - end + server.stop_service true end |