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

tweak logging

Browse Source
This commit is contained in:
Erik 2015-04-11 21:45:01 -04:00
parent 96fd2deb51
commit deac1bbe17
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SocketIOClientSwift/SocketEngine.swift
View File

@ -213,7 +213,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
req.cachePolicy = NSURLRequestCachePolicy.ReloadIgnoringLocalAndRemoteCacheData req.cachePolicy = NSURLRequestCachePolicy.ReloadIgnoringLocalAndRemoteCacheData
SocketLogger.log("Engine: Doing polling request: \(req)", client: self) SocketLogger.log("Engine: Doing polling request", client: self)
self.session.dataTaskWithRequest(req) {[weak self] data, res, err in self.session.dataTaskWithRequest(req) {[weak self] data, res, err in
if self == nil { if self == nil {
@ -228,7 +228,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
return return
} }
SocketLogger.log("Engine: Got polling response: \(res)", client: self!) SocketLogger.log("Engine: Got polling response", client: self!)
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String { if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
dispatch_async(self!.parseQueue) { dispatch_async(self!.parseQueue) {
@ -358,6 +358,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
return return
} }
SocketLogger.log("Engine: Starting engine", client: self)
self.closed = false self.closed = false
let (urlPolling, urlWebSocket) = self.createURLs(opts) let (urlPolling, urlWebSocket) = self.createURLs(opts)
self.urlPolling = urlPolling self.urlPolling = urlPolling

2
SocketIOClientSwift/SocketIOClient.swift
View File

@ -379,7 +379,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
return return
} }
SocketLogger.log("Client: Got event: \(event) with data: \(data)", client: self) SocketLogger.log("Client: Handling event: \(event) with data: \(data)", client: self)
if self.anyHandler != nil { if self.anyHandler != nil {
dispatch_async(dispatch_get_main_queue()) {[weak self] in dispatch_async(dispatch_get_main_queue()) {[weak self] in

4
SocketIOClientSwift/SocketPacket.swift
View File

@ -29,8 +29,8 @@ final class SocketPacket: Printable {
var currentPlace = 0 var currentPlace = 0
var data:[AnyObject]? var data:[AnyObject]?
var description:String { var description:String {
var ret = "{SocketPacket\n\ttype: \(self.type?.rawValue)\n\tdata: \(self.data)\n\t" + let ret = "SocketPacket {type: \(self.type?.rawValue) data: \(self.data) " +
"id: \(self.id)\n\tplaceholders: \(self.placeholders)" "id: \(self.id) placeholders: \(self.placeholders)}"
return ret return ret
} }

6
SocketIOClientSwift/SocketParser.swift
View File

@ -194,7 +194,9 @@ class SocketParser {
return return
} }
SocketLogger.log("Parser: Decoded packet as: \(p)", client: socket) if socket.log {
SocketLogger.log("Parser: Decoded packet as: \(p)", client: socket)
}
if p.type == SocketPacket.PacketType.EVENT { if p.type == SocketPacket.PacketType.EVENT {
if checkNSP(p.nsp) { if checkNSP(p.nsp) {
@ -242,7 +244,7 @@ class SocketParser {
// NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros)) // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros))
if socket.waitingData.count == 0 { if socket.waitingData.count == 0 {
NSLog("Got data when not remaking packet") SocketLogger.err("Parser: Got data when not remaking packet", client: socket)
return return
} }