Merge lp://staging/~facundo/magicicada-client/connect-multi-server into lp://staging/magicicada-client
Proposed by
Facundo Batista
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 1437 |
| Merged at revision: | 1435 |
| Proposed branch: | lp://staging/~facundo/magicicada-client/connect-multi-server |
| Merge into: | lp://staging/magicicada-client |
| Prerequisite: | lp://staging/~facundo/magicicada-client/remove-web |
| Diff against target: |
592 lines (+217/-102) 9 files modified
bin/ubuntuone-syncdaemon (+2/-3) data/syncdaemon.conf (+5/-14) ubuntuone/syncdaemon/action_queue.py (+18/-57) ubuntuone/syncdaemon/config.py (+38/-0) ubuntuone/syncdaemon/main.py (+4/-8) ubuntuone/syncdaemon/states.py (+2/-5) ubuntuone/syncdaemon/tests/test_action_queue.py (+78/-13) ubuntuone/syncdaemon/tests/test_config.py (+68/-0) ubuntuone/syncdaemon/tests/test_main.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~facundo/magicicada-client/connect-multi-server |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart | Approve | ||
|
Review via email:
|
|||
Commit message
Allow in the config multiple servers to connect.
These possible multiple servers travel in one simple object, not a miriad of parameters to ActionQueue, which will use them to try to connect. It first tries the first one, on connection error tries the second, and so on until the list ends, and starts again with the first one.
For a quick retry on different servers, I lowered the initial delay to reconnect to 200ms.
To post a comment you must log in.
Revision history for this message
| Natalia Bidart (nataliabidart) | # |
Revision history for this message
| Facundo Batista (facundo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Comments addressed