2
0

Merge pull request #18 from uskudnik/expose-close-and-reconnect

Expose CloseAndReconnect method
This commit is contained in:
Lucas Löffel
2020-01-27 14:55:47 +01:00
committed by GitHub
+6 -6
View File
@@ -56,7 +56,7 @@ type RecConn struct {
} }
// CloseAndReconnect will try to reconnect. // CloseAndReconnect will try to reconnect.
func (rc *RecConn) closeAndReconnect() { func (rc *RecConn) CloseAndReconnect() {
rc.Close() rc.Close()
go rc.connect() go rc.connect()
} }
@@ -97,7 +97,7 @@ func (rc *RecConn) ReadMessage() (messageType int, message []byte, err error) {
if rc.IsConnected() { if rc.IsConnected() {
messageType, message, err = rc.Conn.ReadMessage() messageType, message, err = rc.Conn.ReadMessage()
if err != nil { if err != nil {
rc.closeAndReconnect() rc.CloseAndReconnect()
} }
} }
@@ -115,7 +115,7 @@ func (rc *RecConn) WriteMessage(messageType int, data []byte) error {
err = rc.Conn.WriteMessage(messageType, data) err = rc.Conn.WriteMessage(messageType, data)
rc.mu.Unlock() rc.mu.Unlock()
if err != nil { if err != nil {
rc.closeAndReconnect() rc.CloseAndReconnect()
} }
} }
@@ -135,7 +135,7 @@ func (rc *RecConn) WriteJSON(v interface{}) error {
err = rc.Conn.WriteJSON(v) err = rc.Conn.WriteJSON(v)
rc.mu.Unlock() rc.mu.Unlock()
if err != nil { if err != nil {
rc.closeAndReconnect() rc.CloseAndReconnect()
} }
} }
@@ -154,7 +154,7 @@ func (rc *RecConn) ReadJSON(v interface{}) error {
if rc.IsConnected() { if rc.IsConnected() {
err = rc.Conn.ReadJSON(v) err = rc.Conn.ReadJSON(v)
if err != nil { if err != nil {
rc.closeAndReconnect() rc.CloseAndReconnect()
} }
} }
@@ -364,7 +364,7 @@ func (rc *RecConn) keepAlive() {
<-ticker.C <-ticker.C
if time.Since(keepAliveResponse.getLastResponse()) > rc.getKeepAliveTimeout() { if time.Since(keepAliveResponse.getLastResponse()) > rc.getKeepAliveTimeout() {
rc.closeAndReconnect() rc.CloseAndReconnect()
return return
} }
} }