Merge lp:~lifeless/launchpad/oops into lp:launchpad
Proposed by
Robert Collins
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Michael Hudson-Doyle | ||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||
Merged at revision: | 11543 | ||||||||||||
Proposed branch: | lp:~lifeless/launchpad/oops | ||||||||||||
Merge into: | lp:launchpad | ||||||||||||
Diff against target: |
43 lines (+13/-2) 2 files modified
lib/canonical/launchpad/webapp/adapter.py (+10/-2) lib/lp/services/timeline/timedaction.py (+3/-0) |
||||||||||||
To merge this branch: | bzr merge lp:~lifeless/launchpad/oops | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Hudson-Doyle | Approve | ||
Review via email: mp+35363@code.launchpad.net |
Commit message
Manually close actions when the StatementTracer will not run it closing code path.
Description of the change
Fix timeouts triggered on attempting sql that then do session updates from blowing up and showing a 'could not connect to launchpad' error.
To post a comment you must log in.
Looks OK, I take your and William's word that it fixes a real problem :)