commit c65330c6ace7d5acd4f72dbc9dd5668320de657e
author Gilad Arnold <garnold@chromium.org> Thu Sep 20 15:17:48 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Sep 24 23:44:47 2012 -0700
tree cac784a16fb50b6cd4bbe325a1a9d20264ddb596
parent 23988aec0f07d6a901159cf2a9e6e2285073b353

devserver: general cleanup

* Unified logging API via module/class-local _Log() calls.

* Renamed modules: devserver_util --> common_util (this is the common
  util module, and it saves a lot of characters in many places);
  downloadable_artifact --> build_artifact (we don't have any
  non-downloadable artifacts); buildutil.py --> build_util.py (for
  uniformity)

* Reorganized Artifact (now BuildArtifact) class hierarchy to properly
  reflect the inheritance chains.

BUG=None
TEST=Unit tests run successfully

Change-Id: I91f3bd7afe78cc1e2be10b64640515402fb6184b
Reviewed-on: https://gerrit.chromium.org/gerrit/33755
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>

builder.py

diff --git a/builder.py b/builder.py
index 86da49d..fdfb50f 100644
--- a/builder.py
+++ b/builder.py
@@ -8,12 +8,17 @@
 import os
 from portage import dbapi
 from portage import xpak
+import cherrypy
 import portage
 import subprocess
 import sys
 import tempfile
 
-import cherrypy
+import log_util
+
+# Module-local log function.
+def _Log(message, *args, **kwargs):
+  return log_util.LogWithTag('BUILD', message, *args, **kwargs)
 
 
 def _OutputOf(command):
@@ -27,7 +32,7 @@
     subprocess.CalledProcessError if the command fails
   """
   command_name = ' '.join(command)
-  cherrypy.log('Executing: ' + command_name, 'BUILD')
+  _Log('Executing: ' + command_name)
 
   p = subprocess.Popen(command, stdout=subprocess.PIPE)
   output_blob = p.communicate()[0]
@@ -144,7 +149,7 @@
       if old_build_time == build_time:
         continue
 
-    cherrypy.log('Filtering install mask from %s' % pkg, 'BUILD')
+    _Log('Filtering install mask from %s' % pkg)
     _FilterInstallMaskFromPackage(build_path, gmerge_path)
     changed = True
 
@@ -174,17 +179,16 @@
 
   def SetError(self, text):
     cherrypy.response.status = 500
-    cherrypy.log(text, 'BUILD')
+    _Log(text)
     return text
 
   def Build(self, board, pkg, additional_args):
     """Handles a build request from the cherrypy server."""
-    cherrypy.log('Additional build request arguments: ' + str(additional_args),
-                 'BUILD')
+    _Log('Additional build request arguments: ' + str(additional_args))
 
     def _AppendStrToEnvVar(env, var, additional_string):
       env[var] = env.get(var, '') + ' ' + additional_string
-      cherrypy.log('%s flags modified to %s' % (var, env[var]), 'BUILD')
+      _Log('%s flags modified to %s' % (var, env[var]))
 
     env_copy = os.environ.copy()
     if 'use' in additional_args: