Add Verbose to Config and remove Debug variable.

config.go

@@ -43,6 +43,9 @@ type Config struct {
 	// Service is the name of the service being offered if a Handler exists.
 	Service string `json:"service,omitempty"`
 
+	// Verbose enables logging of underlying Gyre/Zyre messages when set to true.
+	Verbose bool `json:"verbose,omitempty"`
+
 	// Version is the optional version string of the service being offered.
 	Version string `json:"version,omitempty"`
 

sleuth.go

@@ -17,9 +17,6 @@ import (
 	"github.com/zeromq/gyre"
 )
 
-// Debug enables logging of underlying Gyre/Zyre messages when set to true.
-var Debug = false
-
 var (
 	group  = "SLEUTH-v0"
 	port   = 5670
@@ -35,6 +32,7 @@ type connection struct {
 	node    string
 	port    int
 	server  bool
+	verbose bool
 	version string
 }
 
@@ -81,6 +79,11 @@ func newNode(log *logger.Logger, conn *connection) (*gyre.Gyre, error) {
 	if err != nil {
 		return nil, newError(errInitialize, err.Error())
 	}
+	if conn.verbose {
+		if err := node.SetVerbose(); err != nil {
+			return nil, newError(errVerbose, err.Error())
+		}
+	}
 	if err := node.SetPort(conn.port); err != nil {
 		return nil, newError(errPort, err.Error())
 	}
@@ -89,11 +92,6 @@ func newNode(log *logger.Logger, conn *connection) (*gyre.Gyre, error) {
 			return nil, newError(errInterface, err.Error())
 		}
 	}
-	if Debug {
-		if err := node.SetVerbose(); err != nil {
-			return nil, newError(errVerbose, err.Error())
-		}
-	}
 	// If announcing a service, add service headers.
 	if conn.server {
 		errors := [...]int{
@@ -133,6 +131,7 @@ func New(config *Config) (*Client, error) {
 	// is guaranteed to be correct in initConfig, errors can be ignored.
 	log, _ := logger.New(config.logLevel)
 	conn := new(connection)
+	conn.verbose = config.Verbose
 	if conn.server = config.Handler != nil; conn.server {
 		conn.handler = config.Handler
 		conn.name = config.Service

sleuth_test.go

@@ -217,9 +217,8 @@ func TestBadLogLevelInConfig(t *testing.T) {
 }
 
 func TestBadServerInstantiation(t *testing.T) {
-	Debug = true
-	defer func() { Debug = false }()
 	_, err := New(&Config{
+		Verbose: true,
 		Handler: new(silentHandler),
 		Service: "sleuth-test-server-four",
 		Port:    1})