Merge lp:~chipaca/ubuntu-push/client-v0-p11 into lp:ubuntu-push
Status: | Merged |
---|---|
Approved by: | John Lenton |
Approved revision: | 60 |
Merged at revision: | 51 |
Proposed branch: | lp:~chipaca/ubuntu-push/client-v0-p11 |
Merge into: | lp:ubuntu-push |
Prerequisite: | lp:~chipaca/ubuntu-push/client-v0-p9 |
Diff against target: |
387 lines (+118/-18) 3 files modified
client/client.go (+31/-6) client/client_test.go (+79/-12) client/session/session.go (+8/-0) |
To merge this branch: | bzr merge lp:~chipaca/ubuntu-push/client-v0-p11 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Samuele Pedroni | Approve | ||
Review via email:
|
Commit message
Several things:
* features:
* Client.doLoop, the puppet master.
* fixes and cleanups:
* added log_level to client config
* added the mysterious sessionRetryCh, used in doLoop to avoid a rather common starvation scenario.
* found a way not to panic out in initSession (not that it's much better)
* unified logging in the client tests a bit
* added logging to session's start error states.
Description of the change
Several things:
* features:
* Client.doLoop, the puppet master.
* fixes and cleanups:
* added log_level to client config
* added the mysterious sessionRetryCh, used in doLoop to avoid a rather common starvation scenario.
* found a way not to panic out in initSession (not that it's much better)
* unified logging in the client tests a bit
* added logging to session's start error states.
ok but land with todo markers
=== modified file 'client/client.go'
--- client/client.go 2014-02-04 13:10:18 +0000
+++ client/client.go 2014-02-04 17:34:01 +0000
@@ -142,6 +142,7 @@
// connectSession kicks off the session connection dance sessionRetrierS topper != nil { sessionRetrierS topper <- true sessionRetrierS topper = nil
func (client *Client) connectSession() {
+ // xxx lp:1276199
if client.
client.
client.
@@ -156,6 +157,7 @@
// disconnectSession disconnects the session sessionRetrierS topper != nil { sessionRetrierS topper <- true
func (client *Client) disconnectSession() {
+ // xxx lp:1276199
if client.
client.