Merge lp:~pfalcon/linaro-android-frontend/logging into lp:linaro-android-frontend

[Paul Sokolovsky]

Initial steps to add logging to the frontend.

[James Westby (james-w)]

review: Approve

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2011-03-15 01:09:15 +0000
+++ android_build/frontend/api.py	2011-04-20 17:43:39 +0000
@@ -2,6 +2,7 @@
 import re
 import subprocess
 import urllib2
+import logging
 
 from django.conf import settings
 from django.http import HttpResponse
@@ -15,6 +16,8 @@
     )
 
 
+log = logging.getLogger(__name__)
+
 auth_headers = {
     'Authorization': 'Basic %s' % (
         base64.encodestring('%s:%s' % (
@@ -40,8 +43,9 @@
     headers = auth_headers.copy()
     if extra_headers:
         headers.update(extra_headers)
-    req = urllib2.Request(
-        settings.SERVER_JENKINS_URL + jenkins_path, data, headers)
+    url = settings.SERVER_JENKINS_URL + jenkins_path
+    log.debug("Jenkins request: %s %s", url, data)
+    req = urllib2.Request(url, data, headers)
     resp = urllib2.urlopen(req)
     return resp.read()
 
@@ -78,6 +82,7 @@
     try:
         return _authJenkins('job/' + job_name + '/config.xml')
     except urllib2.HTTPError, e:
+        log.exception("Error getting config for Jenkins job '%s'", job_name)
         return HttpResponse(
             messageFromWinstoneErrorPage(e.read()), status=e.code)
 
@@ -170,7 +175,7 @@
         if not valid_build_name.match(buildName):
             return HttpResponse("Invalid name.", status=400)
         new_job_name = ownerName + '_' + buildName
-        xml_base = getJobConfig('blank')
+        xml_base = getJobConfig(settings.TEMPLATE_JOB_NAME)
         if isinstance(xml_base, HttpResponse):
             return xml_base
         new_config = replaceConfigDefault(xml_base, request.POST['config'])
@@ -183,6 +188,7 @@
             '~%s/%s' % (ownerName, buildName),
             status=200)
     except Exception, e:
+        log.exception("")
         return HttpResponse("Unknown error:" + str(e), status=500)
 
 
 
=== modified file 'android_build/settings.py'
--- android_build/settings.py	2011-03-25 00:09:03 +0000
+++ android_build/settings.py	2011-04-20 17:43:39 +0000
@@ -10,6 +10,11 @@
 
 from django.conf import global_settings
 import os
+import logging
+
+#TODO: switch to integrated logging configuration when upgrading
+#to django 1.3
+logging.basicConfig(level=logging.INFO)
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -92,5 +97,7 @@
 SERVER_JENKINS_URL = 'http://127.0.0.1:9090/jenkins/'
 FRONTEND_JENKINS_USER = 'admin'
 FRONTEND_JENKINS_PASSWORD = 'password'
+# Name of preconfigured job used as a template for all other jobs
+TEMPLATE_JOB_NAME = 'blank'
 
 USE_OWN_COMBO=False