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

change close method of engine

Browse Source
This commit is contained in:
Erik 2016-01-16 16:40:50 -05:00
parent ec67056d2a
commit 024384dc82
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/SocketEngine.swift
View File

@ -163,7 +163,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
} }
} }
public func close() { public func close(reason: String) {
DefaultSocketLogger.Logger.log("Engine is being closed.", type: logType) DefaultSocketLogger.Logger.log("Engine is being closed.", type: logType)
pingTimer?.invalidate() pingTimer?.invalidate()
@ -179,7 +179,7 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
ws?.disconnect() ws?.disconnect()
stopPolling() stopPolling()
client?.engineDidClose("Disconnect") client?.engineDidClose(reason)
} }
private func createURLs(params: [String: AnyObject]?) -> (String, String) { private func createURLs(params: [String: AnyObject]?) -> (String, String) {

2
Source/SocketEngineSpec.swift
View File

@ -48,7 +48,7 @@ import Foundation
init(client: SocketEngineClient, url: String, options: NSDictionary?) init(client: SocketEngineClient, url: String, options: NSDictionary?)
func close() func close(reason: String)
func didError(error: String) func didError(error: String)
func doFastUpgrade() func doFastUpgrade()
func flushWaitingForPostToWebSocket() func flushWaitingForPostToWebSocket()

6
Source/SocketIOClient.swift
View File

@ -109,7 +109,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
deinit { deinit {
DefaultSocketLogger.Logger.log("Client is being deinit", type: logType) DefaultSocketLogger.Logger.log("Client is being deinit", type: logType)
engine?.close() engine?.close("Client Deinit")
} }
private func addEngine() -> SocketEngineSpec { private func addEngine() -> SocketEngineSpec {
@ -172,7 +172,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
dispatch_after(time, handleQueue) {[weak self] in dispatch_after(time, handleQueue) {[weak self] in
if let this = self where this.status != .Connected { if let this = self where this.status != .Connected {
this.status = .Closed this.status = .Closed
this.engine?.close() this.engine?.close("Connect timeout")
handler?() handler?()
} }
@ -223,7 +223,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
reconnects = false reconnects = false
// Make sure the engine is actually dead. // Make sure the engine is actually dead.
engine?.close() engine?.close("Client closed")
handleEvent("disconnect", data: [reason], isInternalMessage: true) handleEvent("disconnect", data: [reason], isInternalMessage: true)
} }