Merge lp://staging/~tvansteenburgh/python-jujuclient/fix-timeout-watcher into lp://staging/python-jujuclient
Proposed by
Tim Van Steenburgh
| Status: | Merged |
|---|---|
| Merged at revision: | 64 |
| Proposed branch: | lp://staging/~tvansteenburgh/python-jujuclient/fix-timeout-watcher |
| Merge into: | lp://staging/python-jujuclient |
| Diff against target: |
39 lines (+15/-2) 1 file modified
jujuclient.py (+15/-2) |
| To merge this branch: | bzr merge lp://staging/~tvansteenburgh/python-jujuclient/fix-timeout-watcher |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ryan Beisner (community) | Approve | ||
| juju-deployers | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix TimeoutWatcher
The previous version had a couple of problems:
1. Class-level _timeout attr meant all instances of the watcher would share
the same timeout value.
2. The timeout value was being applied to each iteration of the watch instead
of the lifetime of the watch, meaning that the timeout would only expire if
one iteration exceeded the timeout - an unlikely occurence that would
commonly lead to a watch that runs forever.
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
Exercised positive and negative aspects. Confirmed the 45min timeout is now hit, and that successful deploys exit cleanly. Thanks, Tim!