Clean up to match olm

websocket/client.go

@@ -661,15 +661,7 @@ func (c *Client) setupPKCS12TLS() (*tls.Config, error) {
 }
 
 // pingMonitor sends pings at a short interval and triggers reconnect on failure
-func (c *Client) pingMonitor() {
+func (c *Client) sendPing() {
-	ticker := time.NewTicker(c.pingInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-c.done:
-			return
-		case <-ticker.C:
 	if c.conn == nil {
 		return
 	}
@@ -680,7 +672,7 @@ func (c *Client) pingMonitor() {
 	c.processingMux.RUnlock()
 	if isProcessing {
 		logger.Debug("Skipping ping, message is being processed")
-				continue
+		return
 	}
 
 	c.configVersionMux.RLock()
@@ -714,6 +706,21 @@ func (c *Client) pingMonitor() {
 			return
 		}
 	}
+}
+
+func (c *Client) pingMonitor() {
+	// Send an immediate ping as soon as we connect
+	c.sendPing()
+
+	ticker := time.NewTicker(c.pingInterval)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-c.done:
+			return
+		case <-ticker.C:
+			c.sendPing()
 		}
 	}
 }