summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-25 07:32:26 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-25 07:32:26 +0000
commitf414bfc6816b4af0056c3bbd716afea3d8a8eb9f (patch)
treec2b132b68588596c90ae5cf13e8204495e626c25
parent9e0b0731edc6482f91db32748f0674a6ccd2378f (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--lib/rinda/ring.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 619eb1740a..62f809c5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 2c29977d11..deef114092 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -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