From aa4a936f0936eb0acc0af35b99230e353c0bfb75 Mon Sep 17 00:00:00 2001
From: Nick Gauthier <nick@smartlogicsolutions.com>
Date: Thu, 4 Feb 2010 11:08:48 -0500
Subject: [PATCH] added traces to worker. fixed a trace on runner

---
 lib/hydra/runner.rb |  8 +++-----
 lib/hydra/worker.rb | 29 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/hydra/runner.rb b/lib/hydra/runner.rb
index 62caf9b..3fc50af 100644
--- a/lib/hydra/runner.rb
+++ b/lib/hydra/runner.rb
@@ -74,7 +74,7 @@ module Hydra #:nodoc:
             @io.write Ping.new
           end
         rescue IOError => ex
-          $stderr.write "Runner lost Worker"
+          trace "Runner lost Worker"
           @running = false
         end
       end
@@ -92,11 +92,9 @@ module Hydra #:nodoc:
             eval(c.first)
           end
         rescue NameError
-          # $stderr.write "Could not load [#{c.first}] from [#{f}]\n"
-          nil
+          trace "Could not load [#{c.first}] from [#{f}]"
         rescue SyntaxError
-          # $stderr.write "Could not load [#{c.first}] from [#{f}]\n"
-          nil
+          trace "Could not load [#{c.first}] from [#{f}]"
         end
       end
       return klasses.select{|k| k.respond_to? 'suite'}
diff --git a/lib/hydra/worker.rb b/lib/hydra/worker.rb
index 5b2fa66..6375d70 100644
--- a/lib/hydra/worker.rb
+++ b/lib/hydra/worker.rb
@@ -8,6 +8,7 @@ module Hydra #:nodoc:
   # network.
   class Worker
     include Hydra::Messages::Worker
+    traceable('WORKER')
     # Create a new worker.
     # * io: The IO object to use to communicate with the master
     # * num_runners: The number of runners to launch
@@ -52,10 +53,10 @@ module Hydra #:nodoc:
     # the worker to send shutdown messages to its runners.
     def shutdown
       @running = false
-      $stdout.write "WORKER| Notifying #{@runners.size} Runners of Shutdown\n" if @verbose
+      trace "Notifying #{@runners.size} Runners of Shutdown"
       @runners.each do |r|
-        $stdout.write "WORKER| Sending Shutdown to Runner\n" if @verbose
-        $stdout.write "      | #{r.inspect}\n" if @verbose
+        trace "Sending Shutdown to Runner"
+        trace "\t#{r.inspect}"
         r[:io].write(Shutdown.new)
       end
       Thread.exit
@@ -64,7 +65,7 @@ module Hydra #:nodoc:
     private
 
     def boot_runners(num_runners) #:nodoc:
-      $stdout.write "WORKER| Booting #{num_runners} Runners\n" if @verbose
+      trace "Booting #{num_runners} Runners"
       num_runners.times do
         pipe = Hydra::Pipe.new
         child = Process.fork do
@@ -74,12 +75,12 @@ module Hydra #:nodoc:
         pipe.identify_as_parent
         @runners << { :pid => child, :io => pipe, :idle => false }
       end
-      $stdout.write "WORKER| #{@runners.size} Runners booted\n" if @verbose
+      trace "#{@runners.size} Runners booted"
     end
 
     # Continuously process messages
     def process_messages #:nodoc:
-      $stdout.write "WORKER| Processing Messages\n" if @verbose
+      trace "Processing Messages"
       @running = true
 
       Thread.abort_on_exception = true
@@ -89,7 +90,7 @@ module Hydra #:nodoc:
 
       @listeners.each{|l| l.join }
       @io.close
-      $stdout.write "WORKER| Done processing messages\n" if @verbose
+      trace "Done processing messages"
     end
 
     def process_messages_from_master
@@ -98,15 +99,15 @@ module Hydra #:nodoc:
           begin
             message = @io.gets
             if message
-              $stdout.write "WORKER| Received Message from Master\n" if @verbose 
-              $stdout.write "      | #{message.inspect}\n" if @verbose
+              trace "Received Message from Master" 
+              trace "\t#{message.inspect}"
               message.handle(self)
             else
-              $stdout.write "WORKER| Nothing from Master, Pinging\n" if @verbose
+              trace "Nothing from Master, Pinging"
               @io.write Ping.new
             end
           rescue IOError => ex
-            $stderr.write "Worker lost Master\n" if @verbose
+            trace "Worker lost Master"
             Thread.exit
           end
         end
@@ -120,12 +121,12 @@ module Hydra #:nodoc:
             begin
               message = r[:io].gets
               if message
-                $stdout.write "WORKER| Received Message from Runner\n" if @verbose
-                $stdout.write "      | #{message.inspect}\n" if @verbose
+                trace "Received Message from Runner"
+                trace "\t#{message.inspect}"
                 message.handle(self, r)
               end
             rescue IOError => ex
-              $stderr.write "Worker lost Runner [#{r.inspect}]\n" if @verbose
+              trace "Worker lost Runner [#{r.inspect}]"
               Thread.exit
             end
           end