From 14b4df3836468c9382bf97b2c66b993cdc289990 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 11 Aug 2016 21:11:28 -0400 Subject: [PATCH] refactor some reconnect code --- Source/SocketIOClient.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index ca7fe19..b1a8658 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -413,18 +413,16 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable } private func tryReconnectWithReason(reason: String) { - if reconnecting { - DefaultSocketLogger.Logger.log("Starting reconnect", type: logType) - handleEvent("reconnect", data: [reason], isInternalMessage: true) - - _tryReconnect() - } + guard reconnecting else { return } + + DefaultSocketLogger.Logger.log("Starting reconnect", type: logType) + handleEvent("reconnect", data: [reason], isInternalMessage: true) + + _tryReconnect() } private func _tryReconnect() { - if !reconnecting { - return - } + guard reconnecting else { return } if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects { return didDisconnect("Reconnect Failed")