Launchpad itself

Merge lp://staging/~gary/launchpad/bug662912 into lp://staging/launchpad

bug662912
Merge into devel

Proposed by Gary Poster on 2010-10-25

Status:

Merged

Approved by:

Gary Poster on 2010-10-25

Approved revision:

no longer in the source branch.

Merged at revision:

11797

Proposed branch:

lp://staging/~gary/launchpad/bug662912

Merge into:

lp://staging/launchpad

Diff against target:

100 lines (+21/-2)

4 files modified

.bzrignore (+1/-0)
configs/development/launchpad-lazr.conf (+1/-0)
daemons/librarian.tac (+8/-2)
lib/canonical/librarian/web.py (+11/-0)

To merge this branch:

bzr merge lp://staging/~gary/launchpad/bug662912

High

Triaged

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2010-10-25	Approve on 2010-10-25
Review via email: mp+39315@code.staging.launchpad.net

Commit message

Add diagnostics for bug 662912

Description of the change

This branch adds diagnostics to approach bug 662912. As noted in my comment #1 for that bug, I have a hypothesis that this is caused by a rejected hostname. This branch adds log messages for that case, plus all other cases that generate a 404 other than a simple missing file (_eb_getFileAlias in c/librarian/web.py).

It also puts the message about upstream librarians in the logfile so it is easier to see that the configuration is as expected.

It also creates a log file destination for development so developers can look at the locally-generated logs.

Revision history for this message

Robert Collins (lifeless) wrote on 2010-10-25:

The development target for logs is unneeded and harmful, please don't
do that. My librarian branch already captures the log per-test and
includes in the test details.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2010-10-25:

The test output won't change though will it? You need to change the testrunner config for that.

Everything else looks good although as I said on IRC, consider using addSystemEventTrigger instead of callWhenRunning, but that's optional.

review: Approve

Revision history for this message

Gary Poster (gary) wrote on 2010-10-25:

Thank you for the review and comments.

Robert approved the librarian change on IRC.

I looked at the addSystemEventTrigger approach. The behavior is identical to the callWhenRunning version. It's a bit longer spelling, but I guess it is a bit easier to understand the intent. That's a compelling argument, so I made the change.

Thanks again,

Gary