Skip to content

Fix for #80 #84

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
Apr 1, 2016
Merged

Fix for #80 #84

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
7 changes: 7 additions & 0 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type session struct {
sendMutex sync.Mutex

sessionEvent chan event
messageEvent chan bool
application Application
sessionState
stateTimer eventTimer
Expand Down Expand Up @@ -101,6 +102,7 @@ func createSession(sessionID SessionID, storeFactory MessageStoreFactory, settin
}

session.sessionEvent = make(chan event)
session.messageEvent = make(chan bool)
session.application = application
session.stateTimer = eventTimer{Task: func() { session.sessionEvent <- needHeartbeat }}
session.peerTimer = eventTimer{Task: func() { session.sessionEvent <- peerTimeout }}
Expand Down Expand Up @@ -169,6 +171,10 @@ func (s *session) queueForSend(msg Message) {
s.sendMutex.Lock()
defer s.sendMutex.Unlock()
s.toSend = append(s.toSend, msg)
select {
case s.messageEvent <- true:
default:
}
}

//sends queued messages if session is logged on
Expand Down Expand Up @@ -553,6 +559,7 @@ func (s *session) run(msgIn chan fixIn, msgOut chan []byte, quit chan bool) {

case evt := <-s.sessionEvent:
s.sessionState = s.Timeout(s, evt)
case <-s.messageEvent:
}
}
}