Merge lp:~fginther/helipad/fix_lp1208654 into lp:helipad/ci

[Francis Ginther]

Since the default logging handler will do everything that we need (send emails when there are errors) and with the addition of verbosity to the jenkins_pull_ci command (-v 2/-v 3), there is no need to have a custom logger.

Since the default logging handler will do everything that we need (send emails when there are errors) and with the addition of verbosity to the jenkins_pull_ci command (-v 2/-v 3), there is no need to have a custom logger.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://s-jenkins:8080/job/helipad-ci-ci/69/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/69/rebuild

review: Approve (continuous-integration)

[lp:~fginther/helipad/fix_lp1208654]

40. By Francis Ginther on 2013-08-16

Merged trunk.

[Chris Johnston (cjohnston)]

review approve
merge approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://s-jenkins:8080/job/helipad-ci-ci/70/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/70/rebuild

review: Approve (continuous-integration)

=== modified file 'api.py'
--- api.py	2013-07-23 16:12:36 +0000
+++ api.py	2013-08-16 21:38:12 +0000
@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 import json
 from django.shortcuts import get_object_or_404
 from django.utils.dateformat import format
@@ -21,8 +20,6 @@
 from common.utils import JSONResponse
 from ci.models import CiProject, JenkinsBuild
 
-logger = logging.getLogger('qa_dashboard')
-
 
 def project(request, name):
     project = get_object_or_404(

=== modified file 'management/commands/jenkins_pull_ci.py'
--- management/commands/jenkins_pull_ci.py	2013-07-29 17:12:18 +0000
+++ management/commands/jenkins_pull_ci.py	2013-08-16 21:38:12 +0000
@@ -28,8 +28,6 @@
 
 from common.management import JenkinsBaseCommand, jenkins_get
 
-logger = logging.getLogger("qa_dashboard")
-
 # Job name which contains the data dump
 CUPSTREAM2DISTRO_CONFIG_DATA_SOURCE = 'dump-cupstream2distro-config'
 
@@ -61,8 +59,8 @@
         stack_config['ppa'] = stackcfg.get('ppa', '')
         stack_config['server'] = settings.JENKINS_URL
         stack_config['job'] = '{}-{}-{}'.format('cu2d', name, release)
-        logger.debug("Slurping stack: {}".format(stack_name))
-        logger.debug("Using job: {}".format(stack_config['job']))
+        logging.debug("Slurping stack: {}".format(stack_name))
+        logging.debug("Using job: {}".format(stack_config['job']))
         create_cu2d_stack_from_config(stack_config)
         return stack_name
 
@@ -83,9 +81,9 @@
         project_data = stackcfg['projects'][project_name]
         project_config['ci'] = project_data.get('ci', None)
         project_config['autolanding'] = project_data.get('autolanding', None)
-        logger.debug("Slurping project: {}".format(project_name))
-        logger.debug("Ci job: {}".format(project_config['ci']))
-        logger.debug(
+        logging.debug("Slurping project: {}".format(project_name))
+        logging.debug("Ci job: {}".format(project_config['ci']))
+        logging.debug(
             "Autolanding job: {}".format(project_config['autolanding']),
         )
         create_ci_project(project_config)
@@ -146,19 +144,21 @@
             # Parse the stack release and name from the url
             (release, config_name) = self._extract_release_and_config_name(url)
             if config_is_on_blacklist(config_name):
-                logger.debug("Skipping cu2d config at {} due to blacklist "
-                             "match.".format(config_name))
+                logging.debug(
+                    "Skipping cu2d config at {} due to blacklist "
+                    "match.".format(config_name),
+                )
                 continue
 
             data = self._load_artifact(url)
             # Process the stack
             if not data:
                 # Stack has no contents
-                logger.debug("No projects found in {}".format(url))
+                logging.debug("No projects found in {}".format(url))
                 continue
             if 'projects' not in data:
                 # Stack has no projects
-                logger.debug("No projects found in {}".format(url))
+                logging.debug("No projects found in {}".format(url))
                 continue
             stack_name = self._create_stack(data, release)
 
@@ -170,6 +170,11 @@
         return
 
     def handle(self, *args, **options):
+        verbosity = int(options.get('verbosity'))
+        if verbosity == 2:
+            logging.basicConfig(level=logging.INFO)
+        elif verbosity > 2:
+            logging.basicConfig(level=logging.DEBUG)
         if options.get('initial_run'):
             self.initial_run()
         else:

=== modified file 'models.py'
--- models.py	2013-08-09 16:00:35 +0000
+++ models.py	2013-08-16 21:38:12 +0000
@@ -20,9 +20,6 @@
 import util.heuristics as heuristics
 from launchpadlib.launchpad import Launchpad
 from lxml.etree import XMLSyntaxError
-#import common.models
-
-logger = logging.getLogger("qa_dashboard")
 
 
 BLACKLIST_JOBS = [
@@ -75,7 +72,7 @@
         try:
             return self.last_successful_build.coverage_report.line_count
         except AttributeError:
-            logger.debug("line_count AttributeError in JenkinsJob")
+            logging.debug("line_count AttributeError in JenkinsJob")
             return None
 
     @property
@@ -83,7 +80,7 @@
         try:
             return self.last_successful_build.coverage_report.hit_count
         except AttributeError:
-            logger.debug('hit_count AttributeError in JenkinsJob')
+            logging.debug('hit_count AttributeError in JenkinsJob')
             return None
 
     @property
@@ -91,7 +88,7 @@
         try:
             return self.last_successful_build.coverage_report.taken_count
         except AttributeError:
-            logger.debug('taken_count AttributeError in JenkinsJob')
+            logging.debug('taken_count AttributeError in JenkinsJob')
             return None
 
     @property
@@ -99,7 +96,7 @@
         try:
             return self.last_successful_build.coverage_report.total_count
         except AttributeError:
-            logger.debug('total_count AttributeError in JenkinsJob')
+            logging.debug('total_count AttributeError in JenkinsJob')
             return None
 
     @property
@@ -361,7 +358,7 @@
         try:
             return self.integration_job.last_build
         except AttributeError:
-            logger.debug("No integration_job set for {}.".format(self.name))
+            logging.debug("No integration_job set for {}.".format(self.name))
             return None
 
     @property
@@ -369,7 +366,7 @@
         try:
             return self.integration_job.last_successful_build
         except AttributeError:
-            logger.debug("No integration_job set for {}.".format(self.name))
+            logging.debug("No integration_job set for {}.".format(self.name))
             return None
 
     @property

=== modified file 'templatetags/ci_extras.py'
--- templatetags/ci_extras.py	2013-07-25 18:35:05 +0000
+++ templatetags/ci_extras.py	2013-08-16 21:38:12 +0000
@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import template
-import logging
 
-logger = logging.getLogger('qa_dashboard')
 register = template.Library()
 
 

=== modified file 'templatetags/percentage.py'
--- templatetags/percentage.py	2013-07-25 15:43:21 +0000
+++ templatetags/percentage.py	2013-08-16 21:38:12 +0000
@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import template
-import logging
 
-logger = logging.getLogger('qa_dashboard')
 register = template.Library()
 
 

=== modified file 'tests/integration/test_jenkins_build.py'
--- tests/integration/test_jenkins_build.py	2013-07-16 17:11:09 +0000
+++ tests/integration/test_jenkins_build.py	2013-08-16 21:38:12 +0000
@@ -36,8 +36,8 @@
 class JenkinsBuildTestCase(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
         # slurp a vanilla JenkinsJob and JenkinsBuild
         self.jenkins_job_url = urljoin(
             JENKINS_BASE_URL,
@@ -54,7 +54,7 @@
             self.jenkins_job)
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
 class TestBuildCreation(JenkinsBuildTestCase):

=== modified file 'tests/integration/test_jenkins_job.py'
--- tests/integration/test_jenkins_job.py	2013-07-16 17:29:47 +0000
+++ tests/integration/test_jenkins_job.py	2013-08-16 21:38:12 +0000
@@ -38,11 +38,11 @@
 class TestJenkinsJobCreateFromUrl(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     @attr('qa_lab')
     def test_no_builds_param_doesnt_create_builds(self):
@@ -63,8 +63,8 @@
     fixtures = ['duplicate_job_fixture.json']
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        #self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        #self.logging_patch.start()
         # slurp a vanilla JenkinsJob and JenkinsBuild
         self.jenkins_job_url = urljoin(
             JENKINS_BASE_URL,
@@ -72,7 +72,7 @@
 
     def tearDown(self):
         pass
-        #self.logger_patch.stop()
+        #self.logging_patch.stop()
 
     @skip
     @attr('qa_lab')
@@ -93,11 +93,11 @@
     fixtures = ['head-indicators.json']
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     @attr('qa_lab')
     def test_update_job(self):

=== modified file 'tests/test_jenkins_pull_ci.py'
--- tests/test_jenkins_pull_ci.py	2013-07-28 21:26:11 +0000
+++ tests/test_jenkins_pull_ci.py	2013-08-16 21:38:12 +0000
@@ -57,13 +57,13 @@
             new=command_mock)
         self.command_patch.start()
         self.command = Command()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
 
     def tearDown(self):
         self.command_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
 class TestJenkinsPullCiCommand(JenkinsPullCiCommandTestCase):

=== modified file 'tests/unit/test_ci_project.py'
--- tests/unit/test_ci_project.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_ci_project.py	2013-08-16 21:38:12 +0000
@@ -139,13 +139,13 @@
             new=ci_project_mock)
         self.ci_project_patch.start()
         self.ci_project = CiProject()
-        self.logger_patch = patch(
-            'ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch(
+            'ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
         self.ci_project_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
 class TestLastCoverageBuild(CiProjectUnitTestCase):

=== modified file 'tests/unit/test_ci_project_import.py'
--- tests/unit/test_ci_project_import.py	2013-07-26 01:50:54 +0000
+++ tests/unit/test_ci_project_import.py	2013-08-16 21:38:12 +0000
@@ -25,11 +25,11 @@
 class CiProjectManagerTestCase(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
 class TestCreate(CiProjectManagerTestCase):

=== modified file 'tests/unit/test_cu2d_stack_import.py'
--- tests/unit/test_cu2d_stack_import.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_cu2d_stack_import.py	2013-08-16 21:38:12 +0000
@@ -22,11 +22,11 @@
 class TestCreateFromConfig(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     def test_vanilla(self):
         series_get_or_create = MagicMock(

=== modified file 'tests/unit/test_jenkins_build.py'
--- tests/unit/test_jenkins_build.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_jenkins_build.py	2013-08-16 21:38:12 +0000
@@ -33,13 +33,13 @@
         self.jenkins_build_patch.start()
         self.jenkins_build = \
             JenkinsBuild()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
 
     def tearDown(self):
         self.jenkins_build_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
     def test_unicode(self):

=== modified file 'tests/unit/test_jenkins_build_import.py'
--- tests/unit/test_jenkins_build_import.py	2013-08-02 20:45:21 +0000
+++ tests/unit/test_jenkins_build_import.py	2013-08-16 21:38:12 +0000
@@ -31,14 +31,14 @@
             'create',
             new=jenkins_build_objects_create_mock)
         self.jenkins_build_objects_create = self.jenkins_build_objects_create_patch.start()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
         self.dummy_url = "http://this.string.is.actually.a.URL/no/kidding"
         self.dummy_jenkins_job = "a Django representation of a Jenkins job"
 
     def tearDown(self):
         self.jenkins_build_objects_create_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
 
 class TestCreateFromUrl(JenkinsBuildManagerTestCase):

=== modified file 'tests/unit/test_jenkins_coverage_report_import.py'
--- tests/unit/test_jenkins_coverage_report_import.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_jenkins_coverage_report_import.py	2013-08-16 21:38:12 +0000
@@ -22,8 +22,8 @@
 class TestCreateFromCoberturaXml(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
         self.fake_url = "http://this.is.a.url.com/click/me"
         self.fake_jenkins_build = "fake_jenkins_build"
         self.extractor_jenkins_coverage_params = {
@@ -47,7 +47,7 @@
     def tearDown(self):
         self.extractor_jenkins_coverage_patch.stop()
         self.jenkins_coverage_report_create_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     def test_vanilla(self):
         result = util_coverage_report.create_coverage_report_from_url(

=== modified file 'tests/unit/test_jenkins_job.py'
--- tests/unit/test_jenkins_job.py	2013-07-16 17:11:09 +0000
+++ tests/unit/test_jenkins_job.py	2013-08-16 21:38:12 +0000
@@ -34,12 +34,12 @@
         self.jenkins_job_patch.start()
         self.jenkins_job = \
             JenkinsJob()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
         self.jenkins_job_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     def test_unicode(self):
         self.jenkins_job.name = 'deep-thought-autolanding'

=== modified file 'tests/unit/test_jenkins_job_import.py'
--- tests/unit/test_jenkins_job_import.py	2013-07-16 17:11:09 +0000
+++ tests/unit/test_jenkins_job_import.py	2013-08-16 21:38:12 +0000
@@ -33,8 +33,8 @@
             'create',
             new=jenkins_job_objects_create_mock)
         self.jenkins_job_objects_create = self.jenkins_job_objects_create_patch.start()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
         self.extractor_job_params = {
             'name': 'fake-autolanding',
             'buildable': True,
@@ -48,7 +48,7 @@
 
     def tearDown(self):
         self.jenkins_job_objects_create_patch.stop()
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     def test_vanilla(self):
         extractor_jenkins_job = MagicMock(
@@ -187,8 +187,8 @@
 class TestCreateFromName(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
         jenkins_job_mock = MagicMock(
             spec=JenkinsJob,
             return_value=None)
@@ -201,7 +201,7 @@
             JenkinsJob()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
         self.jenkins_job_patch.stop()
 
     def test_vanilla(self):

=== modified file 'tests/unit/test_launchpad_project_import.py'
--- tests/unit/test_launchpad_project_import.py	2013-07-26 01:50:54 +0000
+++ tests/unit/test_launchpad_project_import.py	2013-08-16 21:38:12 +0000
@@ -22,11 +22,11 @@
 class TestCreateFromName(TestCase):
 
     def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
+        self.logging_patch = patch('ci.models.logging')
+        self.logging_patch.start()
 
     def tearDown(self):
-        self.logger_patch.stop()
+        self.logging_patch.stop()
 
     # TODO restore this when we're really dealing with Launchpad
     def test_vanilla(self):

=== modified file 'util/coverage_report.py'
--- util/coverage_report.py	2013-07-16 17:29:47 +0000
+++ util/coverage_report.py	2013-08-16 21:38:12 +0000
@@ -18,14 +18,12 @@
 from ci.models import JenkinsCoverageReport
 import ci.util.extractor as extractor
 
-logger = logging.getLogger('qa_dashboard')
-
 
 def create_coverage_report_from_url(jenkins_build, url):
     try:
         extractor_report = extractor.JenkinsCoverage(url)
     except XMLSyntaxError:
-        logger.error("XML parsing error for coverage report at {} .".format(url))
+        logging.error("XML parsing error for coverage report at {} .".format(url))
         return None
     return JenkinsCoverageReport.objects.create(
         jenkins_build=jenkins_build,

=== modified file 'util/extractor.py'
--- util/extractor.py	2013-08-09 16:00:35 +0000
+++ util/extractor.py	2013-08-16 21:38:12 +0000
@@ -24,8 +24,6 @@
 
 """Classes and utilities to extract QA data from jenkins"""
 
-logger = logging.getLogger('qa_dashboard')
-
 
 class BuildUrl(object):
     def __init__(self, number=None, url=None):

=== modified file 'util/jenkins_build.py'
--- util/jenkins_build.py	2013-08-09 16:00:35 +0000
+++ util/jenkins_build.py	2013-08-16 21:38:12 +0000
@@ -24,7 +24,6 @@
 from ci.util.coverage_report import create_coverage_report_from_url
 from ci.util.jenkins_test_report import create_jenkins_test_report_from_url
 
-logger = logging.getLogger('qa_dashboard')
 
 BLACKLIST_JOBS = [
     'generic-dput',
@@ -47,17 +46,17 @@
         try:
             extractor_build = extractor.JenkinsBuild(downstream_build.url)
         except EnvironmentError, e:
-            logger.info("EnvironmentError: {}".format(e))
+            logging.info("EnvironmentError: {}".format(e))
             continue
         job_name = extractor_build.job_name
         build_number = extractor_build.number
-        logger.debug("downstream job: {}\tbuild: {}".format(job_name,
+        logging.debug("downstream job: {}\tbuild: {}".format(job_name,
                                                             build_number))
         # make sure we have the JenkinsJob
         try:
             jenkins_job = JenkinsJob.objects.get(name=job_name)
         except JenkinsJob.DoesNotExist:
-            logger.debug("Need to create job: {}".format(job_name))
+            logging.debug("Need to create job: {}".format(job_name))
             # TODO reexamine circular import problem
             from ci.util.jenkins_job import create_jenkins_job_from_name
             jenkins_job = create_jenkins_job_from_name(server,
@@ -87,25 +86,25 @@
     """
 
     # get a Cobertura coverage report, if it exists
-    logger.debug("Slurping Cobertura reports.")
+    logging.debug("Slurping Cobertura reports.")
     try:
         coverage_url = extractor_build.get_coverage_report_url()
         jenkins_coverage_report = create_coverage_report_from_url(
             jenkins_build, coverage_url)
         jenkins_build.coverage_report = jenkins_coverage_report
         jenkins_build.save()
-        logger.info("Cobertura created: {}.".format(jenkins_build.number))
+        logging.info("Cobertura created: {}.".format(jenkins_build.number))
     except EnvironmentError, e:
         # no biggie, we just don't have a Cobertura report
-        logger.info("No Cobertura data: {}".format(e))
+        logging.info("No Cobertura data: {}".format(e))
     except IntegrityError, e:
-        logger.info("Cobertura duplicate encountered.")
+        logging.info("Cobertura duplicate encountered.")
         #transaction.rollback()
         pass
 
 def aggregate_coverage_report(jenkins_build):
     # TODO use django aggregation?
-    logger.debug("Aggegate coverage reports: %s" % jenkins_build)
+    logging.debug("Aggegate coverage reports: %s" % jenkins_build)
     if jenkins_build.coverage_report:
         # Don't aggregate when the build already has a coverage report
         return
@@ -137,26 +136,26 @@
 
 def create_jenkins_test_report(jenkins_build, extractor_build):
 
-    logger.debug("Slurping Test Reports.")
+    logging.debug("Slurping Test Reports.")
     try:
         test_url = extractor_build.get_test_report_url()
         jenkins_test_report = create_jenkins_test_report_from_url(
             jenkins_build, test_url)
         jenkins_build.test_report = jenkins_test_report
         jenkins_build.save()
-        logger.info("Test Report created: {}.".format(jenkins_build.number))
+        logging.info("Test Report created: {}.".format(jenkins_build.number))
     except EnvironmentError, e:
         # no data if the build failed, e.g.
-        logger.info("No test report data found: {}".format(e))
+        logging.info("No test report data found: {}".format(e))
     except IntegrityError, e:
-        logger.info("Test Report duplicate encountered.")
-        logger.debug(e)
+        logging.info("Test Report duplicate encountered.")
+        logging.debug(e)
         transaction.rollback()
 
 
 def aggregate_test_report(jenkins_build):
     # TODO use django aggregation?
-    logger.debug("Aggegate test reports: %s" % jenkins_build)
+    logging.debug("Aggegate test reports: %s" % jenkins_build)
     if jenkins_build.test_report:
         # Don't aggregate when the build already has a test report
         return
@@ -192,26 +191,26 @@
     :rtype: Django JenkinsBuild
     """
 
-    logger.debug("JenkinsBuildManager creating build from url {}.".format(url))
+    logging.debug("JenkinsBuildManager creating build from url {}.".format(url))
     for name in BLACKLIST_JOBS:
         if name in url:
-            logger.info("Skipping blacklisted job at {}.".format(url))
+            logging.info("Skipping blacklisted job at {}.".format(url))
             return None
     try:
         extractor_build = extractor.JenkinsBuild(url)
     except Exception, e:
         transaction.rollback()
-        logger.error("Exception: {}".format(e))
+        logging.error("Exception: {}".format(e))
         return None
     try:
         if extractor_build.result is None:
             # This build is actively running, no need to slurp it
-            logger.info("Skipping build at {}: may be actively running.".format(url))
+            logging.info("Skipping build at {}: may be actively running.".format(url))
             transaction.rollback()
             return None
     except Exception, e:
         # in some cases this 404s; same as above, no need to slurp a broken build
-        logger.error("Exception while sluring build at {}: {}".format(url, e))
+        logging.error("Exception while sluring build at {}: {}".format(url, e))
         transaction.rollback()
         return None
     
@@ -220,12 +219,12 @@
     except IntegrityError, e:
         # no builds yet, IntegrityError when attempting to create JenkinsResult with None name
         transaction.rollback()
-        logger.debug("No builds yet.")
+        logging.debug("No builds yet.")
         return None
 
     logger.debug("Creating JenkinsBuild at {}.".format(url))
     if jenkins_job is None:
-        logger.warning("Creating JenkinsBuild at {} with no parent job.".format(url))
+        logging.warning("Creating JenkinsBuild at {} with no parent job.".format(url))
     jenkins_build, created = JenkinsBuild.objects.get_or_create(
         jenkins_job=jenkins_job,
         url=url,
@@ -257,9 +256,9 @@
 
     for blacklist in BLACKLIST_JOBS:
         if blacklist in name:
-            logger.info("Skipping blacklisted build {} #{}.".format(name, number))
+            logging.info("Skipping blacklisted build {} #{}.".format(name, number))
             return None
-    logger.debug("Creating JenkinsBuild for {} #{}.".format(name, number))
+    logging.debug("Creating JenkinsBuild for {} #{}.".format(name, number))
     try:
         jenkins_job = JenkinsJob.objects.get(name=name)
     except JenkinsJob.DoesNotExist:

=== modified file 'util/jenkins_job.py'
--- util/jenkins_job.py	2013-08-15 15:39:04 +0000
+++ util/jenkins_job.py	2013-08-16 21:38:12 +0000
@@ -28,7 +28,6 @@
 class CiException(Exception):
     pass
 
-logger = logging.getLogger('qa_dashboard')
 
 BLACKLIST_JOBS = [
     'generic-dput',
@@ -60,10 +59,10 @@
     :rtype: Django JenkinsJob
     """
 
-    logger.info("JenkinsJob create_from_url: %s" % (url))
+    logging.info("JenkinsJob create_from_url: %s" % (url))
     for name in BLACKLIST_JOBS:
         if name in url:
-            logger.info("Skipping blacklisted job {}.".format(name))
+            logging.info("Skipping blacklisted job {}.".format(name))
             return None
     try:
         extractor_job = extractor.JenkinsJob(url)
@@ -76,13 +75,13 @@
         # No job found on the server: this can happen when a project is
         # defined in a stack but the jobs have not yet been deployed.
         transaction.rollback()
-        logger.debug(e)
+        logging.debug(e)
         return None
     if not created:
         # The job already exists in the database: this is normal even during
         # a fresh import due to the multiple build/job discovery paths.
         if update:
-            logger.debug("Updating job from {}".format(url))
+            logging.debug("Updating job from {}".format(url))
             jenkins_job.update(**params)
     if create_downstream_jobs:
         try:
@@ -90,13 +89,13 @@
                 # TODO: protect against circular refs, just sayin'
                 downstream_jenkins_job = create_jenkins_job_from_url(
                     downstream_extractor_job.url)
-                logger.info("downstream job created: {}".format(downstream_jenkins_job))
+                logging.info("downstream job created: {}".format(downstream_jenkins_job))
                 if downstream_jenkins_job:
                     downstream_jenkins_job.upstream_job = jenkins_job
                     downstream_jenkins_job.project = jenkins_job.project
                     downstream_jenkins_job.save()
         except EnvironmentError, e:
-            logger.info("EnvironmentError: {}".format(e))
+            logging.info("EnvironmentError: {}".format(e))
     if create_builds:
         for build in extractor_job.builds:
             try:
@@ -105,12 +104,12 @@
                 # DEBUGGING: Hack, only return 1 build to speed things up
                 #break
             except EnvironmentError, e:
-                logger.info("EnvironmentError: {}".format(e))
+                logging.info("EnvironmentError: {}".format(e))
     return jenkins_job
 
 
 def create_jenkins_job_from_name(server, name):
-    logger.debug("Creating JenkinsJob from name {}.".format(name))
+    logging.debug("Creating JenkinsJob from name {}.".format(name))
     return create_jenkins_job_from_url(extractor.get_job_url(server, name))
 
 
@@ -139,7 +138,7 @@
             build = util_jenkins_build.create_jenkins_build_from_url(
                 jenkinsapi_build.baseurl, jenkins_job)
             if not build:
-                logger.error("Failed to create build for {}.".format(jenkins_job))
+                logging.error("Failed to create build for {}.".format(jenkins_job))
     except CiException:
         # This happens when a job that was published in the past is not
         # found. This can happen due to multiconfiguration jobs that have

=== modified file 'views.py'
--- views.py	2013-07-25 15:40:32 +0000
+++ views.py	2013-08-16 21:38:12 +0000
@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 from django.template import RequestContext
 from django.shortcuts import get_object_or_404, render_to_response
 
@@ -27,8 +26,6 @@
     LaunchpadProject,
 )
 
-logger = logging.getLogger('qa_dashboard')
-
 
 BRANCH_FILTER_TYPES = ['all',
                        'autolanding',