Merge lp:~nuclearbob/utah/log-changes into lp:utah

[Max Brustkern]

This branch adds three changes.

A dumplogs option is added to the provisioning scripts. This will print all client logs to standard out after retrieval.

The default log collector script used by the jenkins jobs is updated to place yaml files in a clientlogs directory.

The format for console logging is set to the same as the file logging format, complete with timestamps.

[Joe Talbott (joetalbott)]

Looks good. Thanks.

review: Approve

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2012-11-16 15:39:51 +0000
+++ examples/run_install_test.py	2012-11-16 21:27:24 +0000
@@ -77,6 +77,8 @@
     parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
                         'none'), help='Enable or disable automatic '
                         'configuration rewriting')
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
     return parser
 
 
 
=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2012-11-14 16:14:38 +0000
+++ examples/run_test_bamboo_feeder.py	2012-11-16 21:27:24 +0000
@@ -48,6 +48,8 @@
                         help='Enable debug logging')
     parser.add_argument('-j', '--json', action='store_true',
                         help='Enable json logging (default is YAML)')
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
     return parser
 
 
 
=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-11-16 15:39:51 +0000
+++ examples/run_test_cobbler.py	2012-11-16 21:27:24 +0000
@@ -54,6 +54,8 @@
     parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
                         'none'), help='Enable or disable automatic '
                         'configuration rewriting')
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
     return parser
 
 
 
=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2012-11-16 15:39:51 +0000
+++ examples/run_test_vm.py	2012-11-16 21:27:24 +0000
@@ -45,6 +45,8 @@
     parser.add_argument('-o', '--outdir', 
                         help=('Directory to store locally copied files '
                          '(Default is ' + config.logpath + '/machine-name)'))
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
     return parser
 
 
 
=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-11-16 15:39:51 +0000
+++ examples/run_utah_tests.py	2012-11-16 21:27:24 +0000
@@ -81,6 +81,8 @@
     parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
                         'none'), help='Enable or disable automatic '
                         'configuration rewriting')
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
     return parser
 
 
 
=== modified file 'examples/utah_logs.sh'
--- examples/utah_logs.sh	2012-07-31 14:26:27 +0000
+++ examples/utah_logs.sh	2012-11-16 21:27:24 +0000
@@ -4,5 +4,7 @@
 NAME=$(grep -m1 -o "utah-[0-9]*" log)
 grep "$NAME" /var/log/utah/$(hostname).log* > fulllog
 grep -qP "^\t/" log && cp $(grep -P "^\t/" log | sed 's/^\t//') .
+mkdir -p clientlogs
+ls *.yaml >/dev/null 2>&1 && mv *.yaml clientlogs
 sudo /usr/share/utah/examples/utah_syslog.sh "$NAME" > syslog
 exit 0
 
=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-11-16 15:44:03 +0000
+++ utah/provisioning/provisioning.py	2012-11-16 21:27:24 +0000
@@ -244,14 +244,14 @@
             self.logger.removeHandler(handler)
             del handler
         self.consolehandler = logging.StreamHandler(stream=sys.stderr)
-        console_formatter = logging.Formatter('%(levelname)s: %(message)s')
+        log_format = logging.Formatter('%(asctime)s ' + self.name
+                                       + ' %(levelname)s: %(message)s')
+        console_formatter = log_format
         self.consolehandler.setFormatter(console_formatter)
         self.consolehandler.setLevel(config.consoleloglevel)
         self.logger.addHandler(self.consolehandler)
         self.filehandler = logging.handlers.WatchedFileHandler(config.logfile)
-        file_formatter = logging.Formatter('%(asctime)s '
-                                           + self.name
-                                           + ' %(levelname)s: %(message)s')
+        file_formatter = log_format
         self.filehandler.setFormatter(file_formatter)
         self.filehandler.setLevel(config.fileloglevel)
         self.logger.addHandler(self.filehandler)
 
=== modified file 'utah/run.py'
--- utah/run.py	2012-11-16 15:39:51 +0000
+++ utah/run.py	2012-11-16 21:27:24 +0000
@@ -58,6 +58,9 @@
             f.write(stdout)
         machine.logger.info('Test log copied to ' + locallog)
         locallogs.append(locallog)
+        if args.dumplogs:
+            with open(locallog, 'r') as f:
+                print(f.read())
 
     if args.files is not None:
         try: