Merge lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again into lp:launchpad
Proposed by
Francesco Banconi
on 2012-06-18
| Status: | Merged |
|---|---|
| Approved by: | Francesco Banconi on 2012-06-18 |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 15436 |
| Proposed branch: | lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again |
| Merge into: | lp:launchpad |
| Diff against target: |
14 lines (+2/-1) 1 file modified
versions.cfg (+2/-1) |
| To merge this branch: | bzr merge lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Benji York (community) | code | 2012-06-18 | Approve on 2012-06-18 |
|
Review via email:
|
|||
Commit Message
Fixed RabbitMQLayer:setUp timeout.
Description of the Change
= Summary =
RabbitMQLayer:setUp still times out.
== Proposed fix ==
Rather than increasing the timeout again, this time I've changed the relevant code to use an established amount of retries while waiting for the server to be up. This way we ensure the connection is checked for X times, without relying on the wall clock.
The real diff can be found here: http://
No QA.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.