tweak logging

Author: nuclearace

SocketIOClientSwift/SocketEngine.swift

@@ -213,7 +213,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
 
         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
             if self == nil {
@@ -228,7 +228,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
                 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 {
                 dispatch_async(self!.parseQueue) {
@@ -358,6 +358,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
             return
         }
 
+        SocketLogger.log("Engine: Starting engine", client: self)
+        
         self.closed = false
         let (urlPolling, urlWebSocket) = self.createURLs(opts)
         self.urlPolling = urlPolling

SocketIOClientSwift/SocketIOClient.swift

@@ -379,7 +379,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
                 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 {
                 dispatch_async(dispatch_get_main_queue()) {[weak self] in

SocketIOClientSwift/SocketPacket.swift

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

SocketIOClientSwift/SocketParser.swift

@@ -194,7 +194,9 @@ class SocketParser {
             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 checkNSP(p.nsp) {
@@ -242,7 +244,7 @@ class SocketParser {
         // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros))
 
         if socket.waitingData.count == 0 {
-            NSLog("Got data when not remaking packet")
+            SocketLogger.err("Parser: Got data when not remaking packet", client: socket)
             return
         }