Skip to content

Fix race problems in reconnect case #56

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

Open
free6k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix race problems in reconnect case #56

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
28 changes: 21 additions & 7 deletions recws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@ type RecConn struct {
// NonVerbose suppress connecting/reconnecting messages.
NonVerbose bool

isConnected bool
mu sync.RWMutex
url string
reqHeader http.Header
httpResp *http.Response
dialErr error
dialer *websocket.Dialer
isConnected bool
isConnectRunning bool
mu sync.RWMutex
url string
reqHeader http.Header
httpResp *http.Response
dialErr error
dialer *websocket.Dialer

*websocket.Conn
}
Expand Down Expand Up @@ -418,6 +419,15 @@ func (rc *RecConn) keepAlive() {
}

func (rc *RecConn) connect() {
rc.mu.Lock()
canStart := !rc.isConnectRunning
rc.isConnectRunning = true
rc.mu.Unlock()

if !canStart {
return
}

b := rc.getBackoff()
rand.Seed(time.Now().UTC().UnixNano())

Expand Down Expand Up @@ -450,6 +460,10 @@ func (rc *RecConn) connect() {
rc.keepAlive()
}

rc.mu.Lock()
rc.isConnectRunning = false
rc.mu.Unlock()

return
}

Expand Down