[前][次][番号順一覧][スレッド一覧]

ruby-changes:34029

From: akr <ko1@a...>
Date: Sun, 25 May 2014 16:32:35 +0900 (JST)
Subject: [ruby-changes:34029] akr:r46110 (trunk): * lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed

akr	2014-05-25 16:32:26 +0900 (Sun, 25 May 2014)

  New Revision: 46110

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46110

  Log:
    * lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
      threads.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rinda/ring.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 46109)
+++ ChangeLog	(revision 46110)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun May 25 15:53:54 2014  Tanaka Akira  <akr@f...>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
+	  threads.
+
 Sun May 25 15:26:17 2014  Tanaka Akira  <akr@f...>
 
 	* lib/webrick/utils.rb: Override the inspect method of the thread
Index: lib/rinda/ring.rb
===================================================================
--- lib/rinda/ring.rb	(revision 46109)
+++ lib/rinda/ring.rb	(revision 46110)
@@ -225,6 +225,7 @@ module Rinda https://github.com/ruby/ruby/blob/trunk/lib/rinda/ring.rb#L225
 
       @w_services.each do |thread|
         thread.kill
+        thread.join
       end
 
       @sockets.each do |socket|
@@ -232,6 +233,7 @@ module Rinda https://github.com/ruby/ruby/blob/trunk/lib/rinda/ring.rb#L233
       end
 
       @r_service.kill
+      @r_service.join
     end
 
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]