In slave, report parent PID, not child PID up to the RedisQueue.

brynary · Dec 7, 2009 · fc15715 · fc15715
1 parent d7e4231
commit fc15715
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/testjour.rb b/lib/testjour.rb
@@ -42,12 +42,16 @@ def self.logger
   def self.override_logger_pid(pid)
     @overridden_logger_pid = pid
   end
+
+  def self.effective_pid
+    @overridden_logger_pid || $PID
+  end
 
   def self.setup_logger(dir = "./")
     @logger = Logger.new(File.expand_path(File.join(dir, "testjour.log")))
 
     @logger.formatter = proc do |severity, time, progname, msg|
-      "#{time.strftime("%b %d %H:%M:%S")} [#{@overridden_logger_pid || $PID}]: #{msg}\n"
+      "#{time.strftime("%b %d %H:%M:%S")} [#{Testjour.effective_pid}]: #{msg}\n"
     end
 
     @logger.level = Logger::DEBUG

diff --git a/lib/testjour/result.rb b/lib/testjour/result.rb
@@ -31,7 +31,7 @@ def initialize(time, status, step_match = nil, exception = nil)
         @backtrace  = exception.backtrace.join("\n")
       end
 
-      @pid        = $PID
+      @pid        = Testjour.effective_pid
       @hostname   = Testjour.socket_hostname
     end