Skip to content

adds event logging related to session events #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2016
Merged

adds event logging related to session events #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions in_session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func (state inSession) Timeout(session *session, event event) (nextState session
testReq.Header.SetField(tagMsgType, FIXString("1"))
testReq.Body.SetField(tagTestReqID, FIXString("TEST"))
session.send(testReq)
session.log.OnEvent("Sent test request TEST")
session.peerTimer.Reset(time.Duration(int64(1.2 * float64(session.heartBeatTimeout))))
return pendingTimeout{}
}
Expand Down Expand Up @@ -173,7 +174,10 @@ func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int
if seqNum != sentMessageSeqNum {
state.generateSequenceReset(session, seqNum, sentMessageSeqNum)
}

session.resend(msg)
session.log.OnEventf("Resending Message: %v", sentMessageSeqNum)

seqNum = sentMessageSeqNum + 1
nextSeqNum = seqNum
}
Expand Down Expand Up @@ -266,4 +270,6 @@ func (state *inSession) generateSequenceReset(session *session, beginSeqNo int,
//FIXME error check?
msgBytes, _ := sequenceReset.Build()
session.sendBytes(msgBytes)

session.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
}
5 changes: 5 additions & 0 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func createSession(sessionID SessionID, storeFactory MessageStoreFactory, settin
session.stateTimer = eventTimer{Task: func() { session.sessionEvent <- needHeartbeat }}
session.peerTimer = eventTimer{Task: func() { session.sessionEvent <- peerTimeout }}
application.OnCreate(session.sessionID)
session.log.OnEvent("Created session")
sessions.newSession <- session

return nil
Expand Down Expand Up @@ -232,6 +233,8 @@ func (s *session) sendBytes(msg []byte) {
}

func (s *session) doTargetTooHigh(reject targetTooHigh) {
s.log.OnEventf("MsgSeqNum too high, expecting %v but received %v", reject.ExpectedTarget, reject.ReceivedTarget)

resend := NewMessage()
resend.Header.SetField(tagMsgType, FIXString("2"))
resend.Body.SetField(tagBeginSeqNo, FIXInt(reject.ExpectedTarget))
Expand All @@ -243,6 +246,8 @@ func (s *session) doTargetTooHigh(reject targetTooHigh) {
resend.Body.SetField(tagEndSeqNo, FIXInt(endSeqNum))

s.send(resend)

s.log.OnEventf("Sent ResendRequest FROM: %v TO: %v", reject.ExpectedTarget, endSeqNum)
}

func (s *session) verifyLogon(msg Message) MessageRejectError {
Expand Down