Migrate and merge logging_utils from swarming_bot into client/utils.

client/tools/parallel_execution.py

 # Copyright 2014 The Swarming Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0 that
 # can be found in the LICENSE file.
 
 """Toolset to run multiple Swarming tasks in parallel."""
 
 import getpass
 import json
 import os
 import subprocess
 import sys
 import tempfile
 import time
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT_DIR = os.path.dirname(BASE_DIR)
 
 sys.path.insert(0, ROOT_DIR)
 
 import auth
 import isolateserver
+from utils import logging_utils
 from utils import threading_utils
 from utils import tools
 
 
 def task_to_name(name, dimensions, isolated_hash):
   """Returns a task name the same way swarming.py generates them."""
   return '%s/%s/%s' % (
       name,
       '_'.join('%s=%s' % (k, v) for k, v in sorted(dimensions.iteritems())),
       isolated_hash)
@@ skipping 112 matching lines @@
       failed_tasks.append(task_name)
 
   duration = time.time() - start
   print('\nCompleted in %3.2fs' % duration)
   if failed_tasks:
     print('Detected the following failures:')
     for task in sorted(failed_tasks):
       print('  %s' % task)
 
 
-class OptionParser(tools.OptionParserWithLogging):
+class OptionParser(logging_utils.OptionParserWithLogging):
   def __init__(self, **kwargs):
-    tools.OptionParserWithLogging.__init__(self, **kwargs)
+    logging_utils.OptionParserWithLogging.__init__(self, **kwargs)
     self.server_group = tools.optparse.OptionGroup(self, 'Server')
     self.server_group.add_option(
         '-S', '--swarming',
         metavar='URL', default=os.environ.get('SWARMING_SERVER', ''),
         help='Swarming server to use')
     isolateserver.add_isolate_server_options(self.server_group)
     self.add_option_group(self.server_group)
     auth.add_auth_options(self)
     self.add_option(
         '-d', '--dimension', default=[], action='append', nargs=2,
         dest='dimensions', metavar='FOO bar',
         help='dimension to filter on')
     self.add_option(
         '--priority', type='int',
         help='The lower value, the more important the task is. It may be '
             'important to specify a higher priority since the default value '
             'will make the task to be triggered only when the bots are idle.')
     self.add_option(
         '--deadline', type='int', default=6*60*60,
         help='Seconds to allow the task to be pending for a bot to run before '
             'this task request expires.')
 
   def parse_args(self, *args, **kwargs):
-    options, args = tools.OptionParserWithLogging.parse_args(
+    options, args = logging_utils.OptionParserWithLogging.parse_args(
         self, *args, **kwargs)
     options.swarming = options.swarming.rstrip('/')
     if not options.swarming:
       self.error('--swarming is required.')
     auth.process_auth_options(self, options)
     isolateserver.process_isolate_server_options(self, options, False)
     options.dimensions = dict(options.dimensions)
     return options, args
 
   def format_description(self, _):
     return self.description