Merge lp:~chipaca/ubuntu-push/cmdch into lp:ubuntu-push/automatic

[John Lenton]

First pass at a cmdCh in session.

[Samuele Pedroni (pedronis)]

looks good

review: Approve

[lp:~chipaca/ubuntu-push/cmdch]

382. By John Lenton on 2015-03-19

get rid of a corner case in an unrelated test

=== modified file 'client/session/session.go'
--- client/session/session.go	2015-03-18 17:41:59 +0000
+++ client/session/session.go	2015-03-19 11:36:08 +0000
@@ -39,6 +39,14 @@
 	"launchpad.net/ubuntu-push/util"
 )
 
+type sessCmd uint8
+
+const (
+	cmdDisconnect sessCmd = iota
+	cmdConnect
+	cmdResetCookie
+)
+
 var (
 	wireVersionBytes = []byte{protocol.ProtocolWireVersion}
 )
@@ -173,8 +181,8 @@
 	redialJitter    func(time.Duration) time.Duration
 	redialDelays    []time.Duration
 	redialDelaysIdx int
-	// connection events come in over here
-	connCh chan bool
+	// connection events, and cookie reset requests, come in over here
+	cmdCh chan sessCmd
 	// last seen connection event is here
 	lastConn bool
 	// connection events are handled by this
@@ -242,7 +250,7 @@
 	}
 	sess.doneCh = make(chan uint32, 1)
 	sess.stopCh = make(chan struct{})
-	sess.connCh = make(chan bool, 1)
+	sess.cmdCh = make(chan sessCmd)
 	sess.errCh = make(chan error, 1)
 
 	// to be overridden by tests
@@ -302,6 +310,10 @@
 }
 
 func (sess *clientSession) ResetCookie() {
+	sess.cmdCh <- cmdResetCookie
+}
+
+func (sess *clientSession) resetCookie() {
 	sess.stopRedial()
 	sess.doClose(true)
 }
@@ -712,8 +724,15 @@
 Loop:
 	for {
 		select {
-		case hasConn := <-sess.connCh:
-			sess.connHandler(hasConn)
+		case cmd := <-sess.cmdCh:
+			switch cmd {
+			case cmdConnect:
+				sess.connHandler(true)
+			case cmdDisconnect:
+				sess.connHandler(false)
+			case cmdResetCookie:
+				sess.resetCookie()
+			}
 		case <-sess.stopCh:
 			sess.Log.Infof("session shutting down.")
 			sess.connLock.Lock()
@@ -775,7 +794,11 @@
 }
 
 func (sess *clientSession) HasConnectivity(hasConn bool) {
-	sess.connCh <- hasConn
+	if hasConn {
+		sess.cmdCh <- cmdConnect
+	} else {
+		sess.cmdCh <- cmdDisconnect
+	}
 }
 
 func init() {

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2015-03-17 10:51:55 +0000
+++ client/session/session_test.go	2015-03-19 11:36:08 +0000
@@ -250,7 +250,7 @@
 	c.Check(sess.TLS.RootCAs, IsNil)
 	c.Check(sess.State(), Equals, Pristine)
 	c.Check(sess.stopCh, NotNil)
-	c.Check(sess.connCh, NotNil)
+	c.Check(sess.cmdCh, NotNil)
 }
 
 func (cs *clientSessionSuite) TestNewSessionHostEndpointWorks(c *C) {
@@ -1689,6 +1689,8 @@
 func (cs *clientSessionSuite) TestResetCookie(c *C) {
 	sess, err := NewSession("foo:443", dummyConf(), "", cs.lvls, cs.log)
 	c.Assert(err, IsNil)
+	c.Assert(sess.KeepConnection(), IsNil)
+	defer sess.StopKeepConnection()
 	c.Check(sess.getCookie(), Equals, "")
 	sess.setCookie("COOKIE")
 	c.Check(sess.getCookie(), Equals, "COOKIE")
@@ -1707,6 +1709,7 @@
 	c.Assert(sess, NotNil)
 	c.Assert(sess.State(), Equals, Pristine)
 	c.Assert(sess.KeepConnection(), IsNil)
+	defer sess.StopKeepConnection()
 	// stopCh is meant to be used just for closing it, but abusing
 	// it for testing seems the right thing to do: this ensures
 	// the thing is ticking along before we check the state of
@@ -1756,6 +1759,7 @@
 	defer sess.StopKeepConnection()
 
 	sess.doneCh <- 23
+	sess.doneCh <- 24 // makes sure the first one has been processed before checking
 
 	c.Check(cs.log.Captured(),
 		Matches, `(?ms).* connected after 23 attempts\.`)