Improve tracing/logging system used in lib/naclports

lib/naclports/source_package.py

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 import urlparse
 
 from naclports import binary_package
 from naclports import configuration
 from naclports import package
 from naclports import package_index
 from naclports import util
 from naclports import paths
-from naclports.util import Log, Trace
+from naclports.util import Log, LogVerbose
 from naclports.error import Error, DisabledError, PkgFormatError
 
 
 class PkgConflictError(Error):
   pass
 
 
 @contextlib.contextmanager
 def RedirectStdoutStderr(filename):
   """Context manager that replaces stdout and stderr streams."""
@@ skipping 35 matching lines @@
 
 
 def ExtractArchive(archive, destination):
   ext = os.path.splitext(archive)[1]
   if ext in ('.gz', '.tgz', '.bz2', '.xz'):
     cmd = ['tar', 'xf', archive, '-C', destination]
   elif ext in ('.zip',):
     cmd = ['unzip', '-q', '-d', destination, archive]
   else:
     raise Error('unhandled extension: %s' % ext)
-  Trace(cmd)
+  LogVerbose(cmd)
   subprocess.check_call(cmd)
 
 
 def RunGitCmd(directory, cmd, error_ok=False):
   cmd = ['git'] + cmd
-  Trace('%s' % ' '.join(cmd))
+  LogVerbose('%s' % ' '.join(cmd))
   p = subprocess.Popen(cmd,
                        cwd=directory,
                        stderr=subprocess.PIPE,
                        stdout=subprocess.PIPE)
   stdout, stderr = p.communicate()
   if not error_ok and p.returncode != 0:
     if stdout:
       Log(stdout)
     if stderr:
       Log(stderr)
@@ skipping 181 matching lines @@
 
     if not force and self.IsBuilt():
       self.LogStatus('Already built')
       return
 
     log_root = os.path.join(paths.OUT_DIR, 'logs')
     util.Makedirs(log_root)
 
     self.LogStatus('Building')
 
-    if util.verbose:
+    if util.log_level > util.LOG_MESSAGE:
       log_filename = None
     else:
       log_filename = os.path.join(log_root, '%s_%s.log' % (self.NAME,
           str(self.config).replace('/', '_')))
       if os.path.exists(log_filename):
         os.remove(log_filename)
 
     start = time.time()
     with util.BuildLock():
       try:
         with RedirectStdoutStderr(log_filename):
-          old_verbose = util.verbose
+          old_log_level = util.log_level
+          util.log_level = util.LOG_VERBOSE
           try:
-            util.verbose = True
             self.Download()
             self.Extract()
             self.Patch()
             self.RunBuildSh()
           finally:
-            util.verbose = old_verbose
+            util.log_level = old_log_level
       except:
         if log_filename:
           with open(log_filename) as log_file:
             sys.stdout.write(log_file.read())
         raise
 
     duration = FormatTimeDelta(time.time() - start)
     util.LogHeading('Build complete', ' [took %s]' % duration)
 
   def RunBuildSh(self):
@@ skipping 74 matching lines @@
                   "Please remove existing checkout and try again: '%s'" % dest)
 
     util.LogHeading('Extracting')
     util.Makedirs(paths.OUT_DIR)
     tmp_output_path = tempfile.mkdtemp(dir=paths.OUT_DIR)
     try:
       ExtractArchive(archive, tmp_output_path)
       src = os.path.join(tmp_output_path, new_foldername)
       if not os.path.isdir(src):
         raise Error('Archive contents not found: %s' % src)
-      Trace("renaming '%s' -> '%s'" % (src, dest))
+      LogVerbose("renaming '%s' -> '%s'" % (src, dest))
       os.rename(src, dest)
     finally:
       shutil.rmtree(tmp_output_path)
 
     self.RemoveStamps()
     WriteStamp(stamp_file, stamp_contents)
 
   def RunCmd(self, cmd, **args):
     try:
       subprocess.check_call(cmd,
@@ skipping 15 matching lines @@
 
   def Patch(self):
     stamp_file = os.path.join(self.GetStampDir(), 'nacl_patch')
     src_dir = self.GetBuildLocation()
     if self.URL is None:
       return
 
     if os.path.exists(stamp_file):
       self.Log('Skipping patch step (cleaning source tree)')
       cmd = ['git', 'clean', '-f', '-d']
-      if not util.verbose:
+      if not util.log_level > util.LOG_MESSAGE:
         cmd.append('-q')
       self.RunCmd(cmd)
       return
 
     util.LogHeading('Patching')
     Log('Init git repo: %s' % src_dir)
     try:
       InitGitRepo(src_dir)
     except subprocess.CalledProcessError as e:
       raise Error(e)
     if os.path.exists(self.GetPatchFile()):
-      Trace('applying patch to: %s' % src_dir)
+      LogVerbose('applying patch to: %s' % src_dir)
       cmd = ['patch', '-p1', '-g0', '--no-backup-if-mismatch']
       with open(self.GetPatchFile()) as f:
         self.RunCmd(cmd, stdin=f)
       self.RunCmd(['git', 'add', '.'])
       self.RunCmd(['git', 'commit', '-m', 'Apply naclports patch'])
 
     WriteStamp(stamp_file, '')
 
   def GetExtractStamp(self):
     return os.path.join(self.GetStampDir(), 'extract')
@@ skipping 244 matching lines @@
   if os.path.isdir(package_name):
     return SourcePackage(package_name, config)
 
   for subdir in DEFAULT_LOCATIONS:
     pkg_root = os.path.join(paths.NACLPORTS_ROOT, subdir, package_name)
     info = os.path.join(pkg_root, 'pkg_info')
     if os.path.exists(info):
       return SourcePackage(pkg_root, config)
 
   raise Error("Package not found: %s" % package_name)