Migrate and merge logging_utils from swarming_bot into client/utils.

client/run_isolated.py

 #!/usr/bin/env python
 # Copyright 2012 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.
 
 """Reads a .isolated, creates a tree of hardlinks and runs the test.
 
 To improve performance, it keeps a local cache. The local cache can safely be
 deleted.
 
 Any ${ISOLATED_OUTDIR} on the command line will be replaced by the location of a
 temporary directory upon execution of the command specified in the .isolated
 file. All content written to this directory will be uploaded upon termination
 and the .isolated file describing this directory will be printed to stdout.
 """
 
 __version__ = '0.4.1'
 
 import logging
 import optparse
 import os
 import sys
 import tempfile
 
 from third_party.depot_tools import fix_encoding
 
 from utils import file_path
+from utils import logging_utils
 from utils import on_error
 from utils import subprocess42
 from utils import tools
 from utils import zip_package
 
 import auth
 import isolated_format
 import isolateserver
 
 
@@ skipping 227 matching lines @@
         # file deletion may fail when a test failed.
         if sys.platform != 'win32' or not result:
           on_error.report(None)
         result = 1
 
   return result
 
 
 def main(args):
   tools.disable_buffering()
-  parser = tools.OptionParserWithLogging(
+  parser = logging_utils.OptionParserWithLogging(
       usage='%prog <options>',
       version=__version__,
       log_file=RUN_ISOLATED_LOG_FILE)
 
   data_group = optparse.OptionGroup(parser, 'Data source')
   data_group.add_option(
       '-s', '--isolated',
       help='Hash of the .isolated to grab from the isolate server')
   data_group.add_option(
       '-H', dest='isolated', help=optparse.SUPPRESS_HELP)
@@ skipping 24 matching lines @@
     # Hashing schemes used by |storage| and |cache| MUST match.
     assert storage.hash_algo == cache.hash_algo
     return run_tha_test(
         options.isolated, storage, cache, options.leak_temp_dir, args)
 
 
 if __name__ == '__main__':
   # Ensure that we are always running with the correct encoding.
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))