From decb0ea74d30461bf79ecddb6e23231cb696a76c Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 3 Feb 2015 12:57:20 +0000
Subject: distbuild: Write name of build worker to build-step-xx.log files

Knowing which worker built something is useful for debugging, and right
now that information is only present on the initiator's console. It's
good to have it in the build-step-xx.log file too so the information
doesn't get lost.
---
 distbuild/initiator.py | 48 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/distbuild/initiator.py b/distbuild/initiator.py
index aaae7d62..54331072 100644
--- a/distbuild/initiator.py
+++ b/distbuild/initiator.py
@@ -20,7 +20,7 @@ import cliapp
 import logging
 import os
 import random
-import sys
+import time
 
 import distbuild
 
@@ -137,23 +137,35 @@ class Initiator(distbuild.StateMachine):
         self._step_outputs[msg['step_name']].close()
         del self._step_outputs[msg['step_name']]
 
+    def _get_output(self, msg):
+        return self._step_outputs[msg['step_name']]
+
     def _handle_step_already_started_message(self, msg):
-        self._app.status(
-            msg='%s is already building on %s' % (msg['step_name'],
-                msg['worker_name']))
+        status = '%s is already building on %s' % (
+            msg['step_name'], msg['worker_name'])
+        self._app.status(msg=status)
+
         self._open_output(msg)
 
+        f = self._get_output(msg)
+        f.write(time.strftime('%Y-%m-%d %H:%M:%S ') + status + '\n')
+        f.flush()
+
     def _handle_step_started_message(self, msg):
-        self._app.status(
-            msg='Started building %(step_name)s on %(worker_name)s',
-            step_name=msg['step_name'],
-            worker_name=msg['worker_name'])
+        status = 'Started building %s on %s' % (
+            msg['step_name'], msg['worker_name'])
+        self._app.status(msg=status)
+
         self._open_output(msg)
 
+        f = self._get_output(msg)
+        f.write(time.strftime('%Y-%m-%d %H:%M:%S ') + status + '\n')
+        f.flush()
+
     def _handle_step_output_message(self, msg):
         step_name = msg['step_name']
         if step_name in self._step_outputs:
-            f = self._step_outputs[step_name]
+            f = self._get_output(msg)
             f.write(msg['stdout'])
             f.write(msg['stderr'])
             f.flush()
@@ -164,9 +176,12 @@ class Initiator(distbuild.StateMachine):
     def _handle_step_finished_message(self, msg):
         step_name = msg['step_name']
         if step_name in self._step_outputs:
-            self._app.status(
-                msg='Finished building %(step_name)s',
-                step_name=step_name)
+            status = 'Finished building %s' % step_name
+            self._app.status(msg=status)
+
+            f = self._get_output(msg)
+            f.write(time.strftime('%Y-%m-%d %H:%M:%S ') + status + '\n')
+
             self._close_output(msg)
         else:
             logging.warning(
@@ -175,9 +190,12 @@ class Initiator(distbuild.StateMachine):
     def _handle_step_failed_message(self, msg):
         step_name = msg['step_name']
         if step_name in self._step_outputs:
-            self._app.status(
-                msg='Build failed: %(step_name)s',
-                step_name=step_name)
+            status = 'Build of %s failed.' % step_name
+            self._app.status(msg=status)
+
+            f = self._get_output(msg)
+            f.write(time.strftime('%Y-%m-%d %H:%M:%S ') + status + '\n')
+
             self._close_output(msg)
         else:
             logging.warning(
-- 
cgit v1.2.1