normalized some error logging in session code

Author: Chris Busbey

in_session.go

@@ -40,8 +40,9 @@ func (state inSession) FixMsgIn(session *session, msg Message) (nextState sessio
 	if err := msg.Header.GetField(tagMsgType, &msgType); err == nil {
 		switch string(msgType) {
 		case enum.MsgType_LOGON:
-			session.handleLogon(msg)
-			return
+			if err := session.handleLogon(msg); err != nil {
+				return session.handleError(err)
+			}
 		case enum.MsgType_LOGOUT:
 			session.log.OnEvent("Received logout request")
 			session.log.OnEvent("Sending logout response")
@@ -56,7 +57,9 @@ func (state inSession) FixMsgIn(session *session, msg Message) (nextState sessio
 		}
 	}
 
-	session.store.IncrNextTargetMsgSeqNum()
+	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
+		return session.handleError(err)
+	}
 	return
 }
 
@@ -79,12 +82,16 @@ func (state inSession) Timeout(session *session, event event) (nextState session
 	case needHeartbeat:
 		heartBt := NewMessage()
 		heartBt.Header.SetField(tagMsgType, FIXString("0"))
-		session.send(heartBt)
+		if err := session.send(heartBt); err != nil {
+			return session.handleError(err)
+		}
 	case peerTimeout:
 		testReq := NewMessage()
 		testReq.Header.SetField(tagMsgType, FIXString("1"))
 		testReq.Body.SetField(tagTestReqID, FIXString("TEST"))
-		session.send(testReq)
+		if err := session.send(testReq); err != nil {
+			return session.handleError(err)
+		}
 		session.log.OnEvent("Sent test request TEST")
 		session.peerTimer.Reset(time.Duration(int64(1.2 * float64(session.heartBeatTimeout))))
 		return pendingTimeout{}
@@ -100,10 +107,14 @@ func (state inSession) handleTestRequest(session *session, msg Message) (nextSta
 		heartBt := NewMessage()
 		heartBt.Header.SetField(tagMsgType, FIXString("0"))
 		heartBt.Body.SetField(tagTestReqID, testReq)
-		session.send(heartBt)
+		if err := session.send(heartBt); err != nil {
+			return session.handleError(err)
+		}
 	}
 
-	session.store.IncrNextTargetMsgSeqNum()
+	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
+		return session.handleError(err)
+	}
 	return state
 }
 
@@ -115,7 +126,9 @@ func (state inSession) handleSequenceReset(session *session, msg Message) (nextS
 
 		switch {
 		case newSeqNo > expectedSeqNum:
-			session.store.SetNextTargetMsgSeqNum(int(newSeqNo))
+			if err := session.store.SetNextTargetMsgSeqNum(int(newSeqNo)); err != nil {
+				return session.handleError(err)
+			}
 		case newSeqNo < expectedSeqNum:
 			//FIXME: to be compliant with legacy tests, do not include tag in reftagid? (11c_NewSeqNoLess)
 			session.doReject(msg, valueIsIncorrectNoTag())
@@ -150,7 +163,9 @@ func (state inSession) handleResendRequest(session *session, msg Message) (nextS
 	}
 
 	state.resendMessages(session, int(beginSeqNo), endSeqNo)
-	session.store.IncrNextTargetMsgSeqNum()
+	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
+		return session.handleError(err)
+	}
 	return state
 }
 
@@ -217,7 +232,9 @@ func (state inSession) processReject(session *session, msg Message, rej MessageR
 		return logoutState{}
 	default:
 		session.doReject(msg, rej)
-		session.store.IncrNextTargetMsgSeqNum()
+		if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
+			return session.handleError(err)
+		}
 		return state
 	}
 }

initiator.go

@@ -34,7 +34,7 @@ func (i *Initiator) Start() error {
 			return fmt.Errorf("error on SocketConnectPort: %v", err)
 		}
 
-		var reconnectInterval int = 30 // Default configuration (in seconds)
+		reconnectInterval := 30 // Default configuration (in seconds)
 		if s.HasSetting(config.ReconnectInterval) {
 			if reconnectInterval, err = s.IntSetting(config.ReconnectInterval); err != nil {
 				return fmt.Errorf("error on ReconnectInterval: %v", err)

session.go

@@ -39,6 +39,15 @@ type session struct {
 	targetDefaultApplVerID string
 }
 
+func (s *session) logError(err error) {
+	s.log.OnEvent(err.Error())
+}
+
+func (s *session) handleError(err error) sessionState {
+	s.logError(err)
+	return latentState{}
+}
+
 //TargetDefaultApplicationVersionID returns the default application version ID for messages received by this version.
 //Applicable for For FIX.T.1 sessions.
 func (s *session) TargetDefaultApplicationVersionID() string {
@@ -307,7 +316,9 @@ func (s *session) handleLogon(msg Message) error {
 		}
 
 		s.log.OnEvent("Responding to logon request")
-		s.send(reply)
+		if err := s.send(reply); err != nil {
+			return err
+		}
 	} else {
 		s.log.OnEvent("Received logon response")
 	}
@@ -323,8 +334,7 @@ func (s *session) handleLogon(msg Message) error {
 		}
 	}
 
-	s.store.IncrNextTargetMsgSeqNum()
-	return nil
+	return s.store.IncrNextTargetMsgSeqNum()
 }
 
 func (s *session) initiateLogout(reason string) {
@@ -561,7 +571,10 @@ func (s *session) run(msgIn chan fixIn, msgOut chan []byte, quit chan bool) {
 		}
 
 		s.log.OnEvent("Sending logon request")
-		s.send(logon)
+		if err := s.send(logon); err != nil {
+			s.logError(err)
+			return
+		}
 	}
 
 	fixMsgIn := func(msg Message) {