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

don't bind error when we're not pattern matching

Browse Source
This commit is contained in:
Erik Little 2018-06-07 07:58:11 -04:00
parent 5fdff65281
commit 0a7e1f4185
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/SocketIO/Ack/SocketAckEmitter.swift
View File

@ -75,8 +75,8 @@ public final class SocketAckEmitter : NSObject {
do {
socket.emitAck(ackNum, with: try items.map({ try $0.socketRepresentation() }))
} catch let err {
socket.handleClientEvent(.error, data: [ackNum, items, err])
} catch {
socket.handleClientEvent(.error, data: [ackNum, items, error])
}
}

8
Source/SocketIO/Client/SocketIOClient.swift
View File

@ -214,11 +214,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec {
open func emit(_ event: String, _ items: SocketData...) {
do {
try emit(event, with: items.map({ try $0.socketRepresentation() }))
} catch let err {
} catch {
DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)",
type: logType)
handleClientEvent(.error, data: [event, items, err])
handleClientEvent(.error, data: [event, items, error])
}
}
@ -253,11 +253,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec {
open func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback {
do {
return emitWithAck(event, with: try items.map({ try $0.socketRepresentation() }))
} catch let err {
} catch {
DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)",
type: logType)
handleClientEvent(.error, data: [event, items, err])
handleClientEvent(.error, data: [event, items, error])
return OnAckCallback(ackNumber: -1, items: [], socket: self)
}

12
Source/SocketIO/Client/SocketRawView.swift
View File

@ -48,11 +48,11 @@ public final class SocketRawView : NSObject {
public func emit(_ event: String, _ items: SocketData...) {
do {
try emit(event, with: items.map({ try $0.socketRepresentation() }))
} catch let err {
} catch {
DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)",
type: "SocketIOClient")
socket.handleClientEvent(.error, data: [event, items, err])
socket.handleClientEvent(.error, data: [event, items, error])
}
}
@ -87,11 +87,11 @@ public final class SocketRawView : NSObject {
public func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback {
do {
return emitWithAck(event, with: try items.map({ try $0.socketRepresentation() }))
} catch let err {
} catch {
DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)",
type: "SocketIOClient")
socket.handleClientEvent(.error, data: [event, items, err])
socket.handleClientEvent(.error, data: [event, items, error])
return OnAckCallback(ackNumber: -1, items: [], socket: socket)
}
@ -146,8 +146,8 @@ public final class SocketRawAckView : NSObject {
do {
socket.emit(try items.map({ try $0.socketRepresentation() }), ack: ackNum, binary: false, isAck: true)
} catch let err {
socket.handleClientEvent(.error, data: [ackNum, items, err])
} catch {
socket.handleClientEvent(.error, data: [ackNum, items, error])
}
}