lib/dtr/test_unit/worker_club.rb in xli-dtr-0.0.5 vs lib/dtr/test_unit/worker_club.rb in xli-dtr-1.0.0

@@ -1,6 +1,6 @@
-# Copyright (c) 2007-2008 Li Xiao
+# Copyright (c) 2007-2008 Li Xiao <[e-mail]>
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 # 
@@ -21,46 +21,46 @@
 
       DEFAULT_RUN_TEST_TIMEOUT = 60 #seconds
 
       def start_thread(drb_runner, remote_runner)
         thread = Thread.new(drb_runner, remote_runner) do |local, remote|
-          local.run_test_on(remote, timeout)
+          local.run_test_on(remote)
         end
         thread[:started_on] = Time.now
         workers.add(thread)
       end
 
       # Performs a wait on all the currently running threads and kills any that take
       # too long. It waits by ENV['RUN_TEST_TIMEOUT'] || 60 seconds
       def graceful_shutdown
         while reap_dead_workers("shutdown") > 0
-          DTR.info "Waiting for #{workers.list.length} threads to finish, could take #{timeout} seconds."
+          DTR.info {"Waiting for #{workers.list.length} threads to finish, could take #{timeout} seconds."}
           sleep timeout / 60
         end
       end
 
+      private
       def timeout
-        ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT
+        (ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT).to_i
       end
 
-      private
       def workers
         @workers ||= ThreadGroup.new
       end
 
       # Used internally to kill off any worker threads that have taken too long
       # to complete processing. It returns the count of workers still active
       # after the reap is done. It only runs if there are workers to reap.
       def reap_dead_workers(reason='unknown')
         if workers.list.length > 0
-          DTR.info "Reaping #{workers.list.length} threads because of '#{reason}'"
+          DTR.info {"Reaping #{workers.list.length} threads because of '#{reason}'"}
           error_msg = "#{Time.now}: WorkerClub timed out this thread: #{reason}"
           mark = Time.now
           workers.list.each do |worker|
             worker[:started_on] = Time.now if not worker[:started_on]
 
             if mark - worker[:started_on] > timeout
-              DTR.info "Thread #{worker.inspect} is too old, killing."
+              DTR.info {"Thread #{worker.inspect} is too old, killing."}
               worker.raise(TimeoutError.new(error_msg))
             end
           end
         end
 
\ No newline at end of file