We're always connecting anyway

This commit is contained in:
Erik 2016-01-17 10:29:10 -05:00
parent 5cab7dbb2f
commit c211ab140d

View File

@ -227,7 +227,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
return (urlPolling, urlWebSocket)
}
private func createWebsocketAndConnect(connect: Bool) {
private func createWebsocketAndConnect() {
let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
ws = WebSocket(url: NSURL(string: wsUrl)!)
@ -250,10 +250,8 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
ws?.delegate = self
ws?.selfSignedSSL = selfSigned
if connect {
ws?.connect()
}
}
public func didError(error: String) {
DefaultSocketLogger.Logger.error(error, type: logType)
@ -338,7 +336,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
}
if !forcePolling && !forceWebsockets && upgradeWs {
createWebsocketAndConnect(true)
createWebsocketAndConnect()
}
@ -384,7 +382,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
if forceWebsockets {
polling = false
websocket = true
createWebsocketAndConnect(true)
createWebsocketAndConnect()
return
}