Merge lp://staging/~mbp/rabbitfixture/rabbit-startup into lp://staging/rabbitfixture
Proposed by
Martin Pool
Status: | Merged |
---|---|
Merged at revision: | 26 |
Proposed branch: | lp://staging/~mbp/rabbitfixture/rabbit-startup |
Merge into: | lp://staging/rabbitfixture |
Diff against target: |
34 lines (+7/-4) 1 file modified
rabbitfixture/server.py (+7/-4) |
To merge this branch: | bzr merge lp://staging/~mbp/rabbitfixture/rabbit-startup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella | Approve | ||
Review via email: mp+80285@code.staging.launchpad.net |
This proposal supersedes a proposal from 2011-10-24.
Description of the change
On the weekend, Rabbit failed to start for me, and Launchpad's tests fail with "RabbitMQ server is not running" from inside the code that's meant to be starting it. Making a change similar to the attached one helped me find the rabbit log and understand the problem.
There are two changes:
* exceptions point to the log file which contains the actual failure message
* rather than calling 'check_running' which raises a cryptic message if it's not running, use is_running to decide whether to continue waiting
To post a comment you must log in.
The change to the exception may confuse folk, because the config
workarea gets deleted entirely [when used with transient rabbits in
tests]