Launchpad itself

Merge lp:~thumper/launchpad/moar-request-build-logging into lp:launchpad

  1. moar-request-build-logging
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 12187
Proposed branch: lp:~thumper/launchpad/moar-request-build-logging
Merge into: lp:launchpad
Diff against target: 60 lines (+12/-5)
2 files modified
lib/lp/code/model/sourcepackagerecipebuild.py (+10/-4)
lib/lp/code/model/tests/test_sourcepackagerecipebuild.py (+2/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/moar-request-build-logging
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+45803@code.launchpad.net

Commit message

[r=gmb][ui=none][no-qa] Adds more logging to the request_daily_build script.

Description of the change

Adds more logging to the request_daily_build script.

This would have been really useful in some debugging I was just doing.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
2--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-12-20 20:36:16 +0000
3+++ lib/lp/code/model/sourcepackagerecipebuild.py 2011-01-11 01:11:59 +0000
4@@ -11,6 +11,7 @@
5 ]
6
7 import datetime
8+import logging
9 import sys
10
11 from psycopg2 import ProgrammingError
12@@ -185,25 +186,30 @@
13 def makeDailyBuilds(logger=None):
14 from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
15 recipes = SourcePackageRecipe.findStaleDailyBuilds()
16+ if logger is None:
17+ logger = logging.getLogger()
18 builds = []
19 for recipe in recipes:
20+ logger.debug(
21+ 'Recipe %s/%s is stale', recipe.owner.name, recipe.name)
22 for distroseries in recipe.distroseries:
23+ series_name = distroseries.named_version
24 try:
25 build = recipe.requestBuild(
26 recipe.daily_build_archive, recipe.owner,
27 distroseries, PackagePublishingPocket.RELEASE)
28 except BuildAlreadyPending:
29+ logger.debug(
30+ ' - build already pending for %s', series_name)
31 continue
32 except ProgrammingError:
33 raise
34 except:
35+ logger.exception(' - problem with %s', series_name)
36 info = sys.exc_info()
37 errorlog.globalErrorUtility.raising(info)
38 else:
39- if logger is not None:
40- logger.debug(
41- 'Build for %s/%s requested',
42- recipe.owner.name, recipe.name)
43+ logger.debug(' - build requested for %s', series_name)
44 builds.append(build)
45 recipe.is_stale = False
46 return builds
47
48=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
49--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-12-23 00:38:29 +0000
50+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2011-01-11 01:11:59 +0000
51@@ -251,7 +251,8 @@
52 logger = BufferLogger()
53 SourcePackageRecipeBuild.makeDailyBuilds(logger)
54 self.assertEqual(
55- 'DEBUG Build for eric/funky-recipe requested\n',
56+ 'DEBUG Recipe eric/funky-recipe is stale\n'
57+ 'DEBUG - build requested for Warty (4.10)\n',
58 logger.getLogBuffer())
59
60 def test_makeDailyBuilds_clears_is_stale(self):