cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks to socketengine

Browse Source
This commit is contained in:
Erik 2015-09-25 10:13:23 -04:00
parent 4ae6489230
commit 0eeecd84ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SocketIOClientSwift/SocketEngine.swift
View File

@ -147,7 +147,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
return .Right(str)
}
}
private func createURLs(params: [String: AnyObject]?) -> (String, String) {
if client == nil {
return ("", "")
@ -188,7 +188,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
return (urlPolling, urlWebSocket)
}
private func createWebsocket(andConnect connect: Bool) {
private func createWebsocketAndConnect(connect: Bool) {
let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
ws = WebSocket(url: NSURL(string: wsUrl)!,
@ -408,7 +408,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
}
if !forcePolling && !forceWebsockets && upgradeWs {
createWebsocket(andConnect: true)
createWebsocketAndConnect(true)
}
}
} catch {
@ -464,7 +464,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
if forceWebsockets {
polling = false
websocket = true
createWebsocket(andConnect: true)
createWebsocketAndConnect(true)
return
}
@ -620,7 +620,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
}
func stopPolling() {
session.invalidateAndCancel()
session.finishTasksAndInvalidate()
}
private func upgradeTransport() {