Merge pull request #642 from ackleymi/add-log

Adds log to readLoop just like writeLoop

Author: ackleymi

acceptor.go

@@ -356,7 +356,7 @@ func (a *Acceptor) handleConnection(netConn net.Conn) {
 
 	go func() {
 		msgIn <- fixIn{msgBytes, parser.lastRead}
-		readLoop(parser, msgIn)
+		readLoop(parser, msgIn, a.globalLog)
 	}()
 
 	writeLoop(netConn, msgOut, a.globalLog)

connection.go

@@ -30,12 +30,13 @@ func writeLoop(connection io.Writer, messageOut chan []byte, log Log) {
 	}
 }
 
-func readLoop(parser *parser, msgIn chan fixIn) {
+func readLoop(parser *parser, msgIn chan fixIn, log Log) {
 	defer close(msgIn)
 
 	for {
 		msg, err := parser.ReadMessage()
 		if err != nil {
+			log.OnEvent(err.Error())
 			return
 		}
 		msgIn <- fixIn{msg, parser.lastRead}

connection_internal_test.go

@@ -45,7 +45,7 @@ func TestReadLoop(t *testing.T) {
 	stream := "hello8=FIX.4.0
9=5
blah
10=103
garbage8=FIX.4.0
9=4
foo
10=103
"
 
 	parser := newParser(strings.NewReader(stream))
-	go readLoop(parser, msgIn)
+	go readLoop(parser, msgIn, nullLog{})
 
 	var tests = []struct {
 		expectedMsg   string

initiator.go

@@ -198,7 +198,7 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 			goto reconnect
 		}
 
-		go readLoop(newParser(bufio.NewReader(netConn)), msgIn)
+		go readLoop(newParser(bufio.NewReader(netConn)), msgIn, session.log)
 		disconnected = make(chan interface{})
 		go func() {
 			writeLoop(netConn, msgOut, session.log)