mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
threads. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9e0b0731ed
commit
f414bfc681
2 changed files with 7 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
|||
Sun May 25 15:53:54 2014 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
|
||||
threads.
|
||||
|
||||
Sun May 25 15:26:17 2014 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* lib/webrick/utils.rb: Override the inspect method of the thread
|
||||
|
|
|
@ -225,6 +225,7 @@ module Rinda
|
|||
|
||||
@w_services.each do |thread|
|
||||
thread.kill
|
||||
thread.join
|
||||
end
|
||||
|
||||
@sockets.each do |socket|
|
||||
|
@ -232,6 +233,7 @@ module Rinda
|
|||
end
|
||||
|
||||
@r_service.kill
|
||||
@r_service.join
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue