about summary refs log tree commit homepage
path: root/lib/rainbows
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-10-11 20:54:05 -0700
committerEric Wong <normalperson@yhbt.net>2009-10-11 20:54:05 -0700
commita267b68ad921d115615abfc15de25a947e86fe38 (patch)
tree54f2aeb3d958a85ff31c89f1a569e5e78f0dda6c /lib/rainbows
parent90a03ee550741465ea43fd70e087851e17246fb6 (diff)
downloadrainbows-a267b68ad921d115615abfc15de25a947e86fe38.tar.gz
They were completely broken in the refactoring :x
Diffstat (limited to 'lib/rainbows')
-rw-r--r--lib/rainbows/base.rb2
-rw-r--r--lib/rainbows/thread_pool.rb2
-rw-r--r--lib/rainbows/thread_spawn.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/rainbows/base.rb b/lib/rainbows/base.rb
index 8a38117..4d5fec1 100644
--- a/lib/rainbows/base.rb
+++ b/lib/rainbows/base.rb
@@ -81,7 +81,7 @@ module Rainbows
       logger.error e.backtrace.join("\n")
     end
 
-    def join_threads(threads)
+    def join_threads(threads, worker)
       logger.info "Joining threads..."
       threads.each { |thr| thr[:quit] = true }
       t0 = Time.now
diff --git a/lib/rainbows/thread_pool.rb b/lib/rainbows/thread_pool.rb
index 647436b..ba85051 100644
--- a/lib/rainbows/thread_pool.rb
+++ b/lib/rainbows/thread_pool.rb
@@ -30,7 +30,7 @@ module Rainbows
           thr.join(timeout) and break
         end
       end
-      join_threads(threads)
+      join_threads(pool, worker)
     end
 
     def new_worker_thread
diff --git a/lib/rainbows/thread_spawn.rb b/lib/rainbows/thread_spawn.rb
index 77cc3f2..05068fc 100644
--- a/lib/rainbows/thread_spawn.rb
+++ b/lib/rainbows/thread_spawn.rb
@@ -50,7 +50,7 @@ module Rainbows
       rescue Object => e
         listen_loop_error(e) if LISTENERS.first
       end while LISTENERS.first && master_pid == Process.ppid
-      join_threads(threads.list)
+      join_threads(threads.list, worker)
     end
 
   end