Merge lp:~nuclearbob/utah/output-machine-name into lp:utah

[Max Brustkern]

This branch writes the machine name to standard output when running any of the standard example test runner scripts that use run.py and updates the example log gathering script to use that name as the machine name.

[Javier Collado (javier.collado)]

Thanks. This makes indeed the logs script more readable.

review: Approve

=== modified file 'examples/utah_logs.sh'
--- examples/utah_logs.sh	2012-11-16 21:21:17 +0000
+++ examples/utah_logs.sh	2012-11-29 16:41:30 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set +e
-NAME=$(grep -m1 -o "utah-[0-9]*" log)
+NAME=$(grep "^Running on machine:" log | sed 's/^Running on machine: //')
 grep "$NAME" /var/log/utah/$(hostname).log* > fulllog
 grep -qP "^\t/" log && cp $(grep -P "^\t/" log | sed 's/^\t//') .
 mkdir -p clientlogs

=== modified file 'utah/run.py'
--- utah/run.py	2012-11-27 11:55:19 +0000
+++ utah/run.py	2012-11-29 16:41:30 +0000
@@ -19,6 +19,9 @@
         if logger.level > logging.INFO:
             logger.setLevel(logging.INFO)
 
+    # Write the machine name to standard out for log gathering
+    print('Running on machine: ' + machine.name)
+
     if args.json:
         extraopts = ' -f json'
         suffix = 'json'