Skip to content
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

various improvements #89

Merged
merged 2 commits into from
Nov 7, 2014
Merged

various improvements #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe81fa
conn: re-use delegate struct
mreiferson Oct 26, 2014
b7d7e92
conn: don't spam draining cleanup log messages
mreiferson Oct 26, 2014
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
14 changes: 11 additions & 3 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ func (c *Conn) auth(secret string) error {
}

func (c *Conn) readLoop() {
delegate := &connMessageDelegate{c}
for {
if atomic.LoadInt32(&c.closeFlag) == 1 {
goto exit
Expand Down Expand Up @@ -494,7 +495,7 @@ func (c *Conn) readLoop() {
c.delegate.OnIOError(c, err)
goto exit
}
msg.Delegate = &connMessageDelegate{c}
msg.Delegate = delegate

atomic.AddInt64(&c.rdyCount, -1)
atomic.AddInt64(&c.messagesInFlight, 1)
Expand Down Expand Up @@ -620,6 +621,7 @@ func (c *Conn) close() {
func (c *Conn) cleanup() {
<-c.drainReady
ticker := time.NewTicker(100 * time.Millisecond)
lastWarning := time.Now()
// writeLoop has exited, drain any remaining in flight messages
for {
// we're racing with readLoop which potentially has a message
Expand All @@ -633,13 +635,19 @@ func (c *Conn) cleanup() {
msgsInFlight = atomic.LoadInt64(&c.messagesInFlight)
}
if msgsInFlight > 0 {
c.log(LogLevelWarning, "draining... waiting for %d messages in flight", msgsInFlight)
if time.Now().Sub(lastWarning) > time.Second {
c.log(LogLevelWarning, "draining... waiting for %d messages in flight", msgsInFlight)
lastWarning = time.Now()
}
continue
}
// until the readLoop has exited we cannot be sure that there
// still won't be a race
if atomic.LoadInt32(&c.readLoopRunning) == 1 {
c.log(LogLevelWarning, "draining... readLoop still running")
if time.Now().Sub(lastWarning) > time.Second {
c.log(LogLevelWarning, "draining... readLoop still running")
lastWarning = time.Now()
}
continue
}
goto exit
Expand Down