Merge remote branch 'cros/upstream' into tempbranch3

server/server_job.py

 """
 The main job wrapper for the server side.
 
 This is the core infrastructure. Derived from the client side job.py
 
 Copyright Martin J. Bligh, Andy Whitcroft 2007
 """
 
 import getpass, os, sys, re, stat, tempfile, time, select, subprocess
 import traceback, shutil, warnings, fcntl, pickle, logging, itertools, errno
@@ skipping 524 matching lines @@
                     shutil.copyfile(CLIENT_WRAPPER_CONTROL_FILE,
                                     server_control_file)
                 else:
                     utils.open_write_close(server_control_file, control)
                 logging.info("Processing control file")
                 self._execute_code(server_control_file, namespace)
                 logging.info("Finished processing control file")
 
                 # no error occured, so we don't need to collect crashinfo
                 collect_crashinfo = False
-            except:
+            except Exception, e:
                 try:
                     logging.exception(
                             'Exception escaped control file, job aborting:')
+                    self.record('INFO', None, None, str(e),
+                                {'job_abort_reason': str(e)})
                 except:
                     pass # don't let logging exceptions here interfere
                 raise
         finally:
             if temp_control_file_dir:
                 # Clean up temp directory used for copies of the control files
                 try:
                     shutil.rmtree(temp_control_file_dir)
                 except Exception, e:
                     logging.warn('Could not remove temp directory %s: %s',
@@ skipping 575 matching lines @@
         intervals = self.disabled_warnings.setdefault(warning_type, [])
         if not intervals or intervals[-1][1] is not None:
             intervals.append((int(current_time_func()), None))
 
 
     def enable_warnings(self, warning_type, current_time_func=time.time):
         """As of now, enables all further warnings of this type."""
         intervals = self.disabled_warnings.get(warning_type, [])
         if intervals and intervals[-1][1] is None:
             intervals[-1] = (intervals[-1][0], int(current_time_func()))