Merge lp:~chipaca/ubuntu-push/dry-close into lp:ubuntu-push/automatic

[John Lenton]

Moving some duplicated code into closeConnection.

[lp:~chipaca/ubuntu-push/dry-close]

392. By John Lenton on 2015-03-19

merged automatic back

393. By John Lenton on 2015-03-19

move the shutdown code to its own function

394. By John Lenton on 2015-03-19

you can't always return g() from f even if f and g have the same signature :(

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'client/session/session.go'
--- client/session/session.go	2015-03-19 13:09:37 +0000
+++ client/session/session.go	2015-03-19 14:15:22 +0000
@@ -442,6 +442,12 @@
 	if resetCookie {
 		sess.cookie = ""
 	}
+	sess.closeConnection()
+	sess.setState(Disconnected)
+}
+
+func (sess *clientSession) closeConnection() {
+	// *must be called with connLock held*
 	if sess.Connection != nil {
 		sess.Connection.Close()
 		// we ignore Close errors, on purpose (the thinking being that
@@ -449,7 +455,6 @@
 		// you could do to recover at this stage).
 		sess.Connection = nil
 	}
-	sess.setState(Disconnected)
 }
 
 // handle "ping" messages
@@ -709,8 +714,15 @@
 	return sess.run(sess.doClose, sess.addAuthorization, sess.getHosts, sess.connect, sess.start, sess.loop)
 }
 
+func (sess *clientSession) shutdown() {
+	sess.Log.Infof("session shutting down.")
+	sess.connLock.Lock()
+	defer sess.connLock.Unlock()
+	sess.stopRedial()
+	sess.closeConnection()
+}
+
 func (sess *clientSession) doKeepConnection() {
-Loop:
 	for {
 		select {
 		case cmd := <-sess.cmdCh:
@@ -723,15 +735,8 @@
 				sess.resetCookie()
 			}
 		case <-sess.stopCh:
-			sess.Log.Infof("session shutting down.")
-			sess.connLock.Lock()
-			defer sess.connLock.Unlock()
-			sess.stopRedial()
-			if sess.Connection != nil {
-				sess.Connection.Close()
-				sess.Connection = nil
-			}
-			break Loop
+			sess.shutdown()
+			return
 		case n := <-sess.doneCh:
 			// if n == 0, the redialer aborted. If you do
 			// anything other than log it, keep that in mind.