Fix unit tests and default NormalLogger

connection.go

@@ -46,6 +46,13 @@ type Options struct {
 	ExitTimeout time.Duration   // How long should we wait for FreeSWITCH to respond to our "exit" command. 5 seconds is a sane default.
 }
 
+// DefaultOptions - The default options used for creating the connection
+var DefaultOptions = Options{
+	Context:     context.Background(),
+	Logger:      NormalLogger{},
+	ExitTimeout: 5 * time.Second,
+}
+
 const EndOfMessage = "\r\n\r\n"
 
 func newConnection(c net.Conn, outbound bool, opts Options) *Conn {

connection_test.go

@@ -23,7 +23,7 @@ import (
 
 func TestConn_SendCommand(t *testing.T) {
 	server, client := net.Pipe()
-	connection := newConnection(client, false)
+	connection := newConnection(client, false, DefaultOptions)
 	defer connection.Close()
 	defer server.Close()
 	defer client.Close()

event_test.go

@@ -21,7 +21,7 @@ const TestEventToSend = "Content-Length: 483\r\nContent-Type: text/event-plain\r
 
 func TestEvent_readPlainEvent(t *testing.T) {
 	server, client := net.Pipe()
-	connection := newConnection(client, false)
+	connection := newConnection(client, false, DefaultOptions)
 	defer connection.Close()
 	defer server.Close()
 	defer client.Close()

inbound.go

@@ -29,11 +29,7 @@ type InboundOptions struct {
 
 // DefaultOutboundOptions - The default options used for creating the inbound connection
 var DefaultInboundOptions = InboundOptions{
-	Options: Options{
-		Context:     context.Background(),
-		Logger:      NormalLogger{},
-		ExitTimeout: 5 * time.Second,
-	},
+	Options:     DefaultOptions,
 	Network:     "tcp",
 	Password:    "ClueCon",
 	AuthTimeout: 5 * time.Second,

logger.go

@@ -16,19 +16,19 @@ type NormalLogger struct{}
 
 func (l NormalLogger) Debug(format string, args ...interface{}) {
 	log.Print("DEBUG: ")
-	log.Printf(format, args)
+	log.Printf(format, args...)
 }
 func (l NormalLogger) Info(format string, args ...interface{}) {
 	log.Print("INFO: ")
-	log.Printf(format, args)
+	log.Printf(format, args...)
 }
 func (l NormalLogger) Warn(format string, args ...interface{}) {
 	log.Print("WARN: ")
-	log.Printf(format, args)
+	log.Printf(format, args...)
 }
 func (l NormalLogger) Error(format string, args ...interface{}) {
 	log.Print("ERROR: ")
-	log.Printf(format, args)
+	log.Printf(format, args...)
 }
 
 func (l NilLogger) Debug(string, ...interface{}) {}

outbound.go

@@ -30,11 +30,7 @@ type OutboundOptions struct {
 
 // DefaultOutboundOptions - The default options used for creating the outbound connection
 var DefaultOutboundOptions = OutboundOptions{
-	Options: Options{
-		Context:     context.Background(),
-		Logger:      NormalLogger{},
-		ExitTimeout: 5 * time.Second,
-	},
+	Options:         DefaultOptions,
 	Network:         "tcp",
 	ConnectTimeout:  5 * time.Second,
 	ConnectionDelay: 25 * time.Millisecond,