From deac1bbe1779e74b33d9acec90ef7f3a3a31c530 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Sat, 11 Apr 2015 21:45:01 -0400
Subject: [PATCH] tweak logging

---
 SocketIOClientSwift/SocketEngine.swift   | 6 ++++--
 SocketIOClientSwift/SocketIOClient.swift | 2 +-
 SocketIOClientSwift/SocketPacket.swift   | 4 ++--
 SocketIOClientSwift/SocketParser.swift   | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index 87b562d..05b53f4 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/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
diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift
index c708fb8..b2bc2af 100644
--- a/SocketIOClientSwift/SocketIOClient.swift
+++ b/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
diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift
index a53f0e8..deebe65 100644
--- a/SocketIOClientSwift/SocketPacket.swift
+++ b/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
     }
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index 48333e4..0352258 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/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
         }