Reorder steps in disconnect and close the router stop channel.

Also add net/http/pprof to test cases for debugging.

Author: Al S-M

client.go

@@ -384,14 +384,14 @@ func (c *Client) internalConnLost(err error) {
 
 func (c *Client) disconnect() {
 	select {
-	case _, ok := <-c.stop:
-		if ok {
-			close(c.stop)
-		}
+	case <-c.stop:
+		//someone else has already closed the channel, must be error
+	default:
+		close(c.stop)
 	}
-	//Wait for all workers to finish before closing connection
-	c.workers.Wait()
 	c.conn.Close()
+	c.workers.Wait()
+	close(c.stopRouter)
 	DEBUG.Println(CLI, "disconnected")
 	c.persist.Close()
 }

unit_client_test.go

@@ -16,14 +16,22 @@ package mqtt
 
 import (
 	"log"
+	"net/http"
 	"os"
 	"testing"
+
+	_ "net/http/pprof"
 )
 
 func init() {
 	DEBUG = log.New(os.Stderr, "DEBUG    ", log.Ltime)
 	WARN = log.New(os.Stderr, "WARNING  ", log.Ltime)
 	CRITICAL = log.New(os.Stderr, "CRITICAL ", log.Ltime)
+	ERROR = log.New(os.Stderr, "ERROR    ", log.Ltime)
+
+	go func() {
+		log.Println(http.ListenAndServe("localhost:6060", nil))
+	}()
 }
 
 func Test_NewClient_simple(t *testing.T) {