Log exceptions that terminate CQ loop

commit_queue.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Commit queue executable.
 
 Reuse Rietveld and the Chromium Try Server to process and automatically commit
 patches.
 """
 
 import logging
 import logging.handlers
 import optparse
 import os
 import signal
 import sys
 import time
-import traceback
 
 import find_depot_tools  # pylint: disable=W0611
 import checkout
 import fix_encoding
 import rietveld
 import subprocess2
 
 import async_push
 import cq_alerts
 import creds
@@ skipping 91 matching lines @@
 def AlertOnUncleanCheckout():
   """Sends an alert if the cq is running live with local edits."""
   diff = subprocess2.capture(['gclient', 'diff'], cwd=ROOT_DIR).strip()
   if diff:
     cq_alerts.SendAlert(
         'CQ running with local diff.',
         ('Ruh-roh! Commit queue was started with an unclean checkout.\n\n'
          '$ gclient diff\n%s' % diff))
 
 
+def SetupLogging(options):
+  """Configures the logging module."""
+  logging.getLogger().setLevel(logging.DEBUG)
+  if options.verbose:
+    level = logging.DEBUG
+  else:
+    level = logging.INFO
+  console_logging = logging.StreamHandler()
+  console_logging.setFormatter(logging.Formatter(
+      '%(asctime)s %(levelname)7s %(message)s'))
+  console_logging.setLevel(level)
+  logging.getLogger().addHandler(console_logging)
+
+  log_directory = 'logs-' + options.project
+  if not os.path.exists(log_directory):
+    os.mkdir(log_directory)
+
+  logging_rotating_file = logging.handlers.RotatingFileHandler(
+      filename=os.path.join(log_directory, 'commit_queue.log'),
+      maxBytes= 10*1024*1024,
+      backupCount=50)
+  logging_rotating_file.setLevel(logging.DEBUG)
+  logging_rotating_file.setFormatter(logging.Formatter(
+      '%(asctime)s %(levelname)-8s %(module)15s(%(lineno)4d): %(message)s'))
+  logging.getLogger().addHandler(logging_rotating_file)
+
+
 def main():
   parser = optparse.OptionParser(
       description=sys.modules['__main__'].__doc__)
   project_choices = projects.supported_projects()
   parser.add_option('-v', '--verbose', action='store_true')
   parser.add_option(
       '--no-dry-run',
       action='store_false',
       dest='dry_run',
       default=True,
@@ skipping 34 matching lines @@
       '--user',
       default='commit-bot@chromium.org',
       help='User to use instead of %default')
   options, args = parser.parse_args()
   if args:
     parser.error('Unsupported args: %s' % args)
   if not options.project:
     parser.error('Need to pass a valid project to --project.\nOptions are: %s' %
         ', '.join(project_choices))
 
-  logging.getLogger().setLevel(logging.DEBUG)
-  if options.verbose:
-    level = logging.DEBUG
-  else:
-    level = logging.INFO
-  console_logging = logging.StreamHandler()
-  console_logging.setFormatter(logging.Formatter(
-      '%(asctime)s %(levelname)7s %(message)s'))
-  console_logging.setLevel(level)
-  logging.getLogger().addHandler(console_logging)
-
-  log_directory = 'logs-' + options.project
-  if not os.path.exists(log_directory):
-    os.mkdir(log_directory)
-
-  logging_rotating_file = logging.handlers.RotatingFileHandler(
-      filename=os.path.join(log_directory, 'commit_queue.log'),
-      maxBytes= 10*1024*1024,
-      backupCount=50)
-  logging_rotating_file.setLevel(logging.DEBUG)
-  logging_rotating_file.setFormatter(logging.Formatter(
-      '%(asctime)s %(levelname)-8s %(module)15s(%(lineno)4d): %(message)s'))
-  logging.getLogger().addHandler(logging_rotating_file)
-
+  SetupLogging(options)
   try:
     work_dir = os.path.join(ROOT_DIR, 'workdir')
     # Use our specific subversion config.
     checkout.SvnMixIn.svn_config = checkout.SvnConfig(
         os.path.join(ROOT_DIR, 'subversion_config'))
 
     url = 'https://chromiumcodereview.appspot.com'
     gaia_creds = creds.Credentials(os.path.join(work_dir, '.gaia_pwd'))
     if options.dry_run:
       logging.debug('Dry run - skipping SCM check.')
@@ skipping 111 matching lines @@
             break
           if sys.stdout.isatty():
             sys.stdout.write('Sleeping for %1.1f seconds          \r' % delay)
             sys.stdout.flush()
           time.sleep(min(delay, 0.1))
           now = time.time()
         if sys.stdout.isatty():
           sys.stdout.write('Running (please do not interrupt)   \r')
           sys.stdout.flush()
         next_loop = time.time() + options.poll_interval
+    except:  # Catch all fatal exit conditions.
+      logging.exception('CQ loop terminating')
+      raise
     finally:
-      print >> sys.stderr, 'Saving db...     '
+      logging.warning('Saving db...')
       pc.save(db_path)
       pc.close()
-      print >> sys.stderr, 'Done!            '
+      logging.warning('db save successful.')
   except KeyboardInterrupt as e:
     print 'Bye bye'
     # 23 is an arbitrary value to signal loop.sh that it must stop looping.
     return 23
-  except SystemExit as e:
-    traceback.print_exc()
-    print >> sys.stderr, ('Tried to exit: %s', e)
-    return e.code
   except errors.ConfigurationError as e:
     parser.error(str(e))
     return 1
   return 0
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())