From 4fdb49ea2fe0a87e5bc6add8259f54a69f38646c Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 18 Aug 2015 10:19:58 -0400 Subject: [PATCH] use static variable for log --- SocketIOClientSwift/SocketEngine.swift | 2 -- SocketIOClientSwift/SocketIOClient.swift | 3 +-- SocketIOClientSwift/SocketLogger.swift | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index 802abd1..ad05f70 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -64,7 +64,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { weak var client: SocketEngineClient? var cookies: [NSHTTPCookie]? - var log = false var sid = "" var socketPath = "" var urlPolling: String? @@ -94,7 +93,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false forcePolling = opts?["forcePolling"] as? Bool ?? false cookies = opts?["cookies"] as? [NSHTTPCookie] - log = opts?["log"] as? Bool ?? false socketPath = opts?["path"] as? String ?? "" extraHeaders = opts?["extraHeaders"] as? [String: String] } diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift index 2612ca6..d606152 100644 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -35,7 +35,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient let logType = "SocketClient" var ackHandlers = SocketAckManager() var currentAck = -1 - var log = false var waitingData = [SocketPacket]() public let emitQueue = dispatch_queue_create("emitQueue", DISPATCH_QUEUE_SERIAL) @@ -73,7 +72,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient } if let log = opts?["log"] as? Bool { - self.log = log + SocketLogger.log = log } if let nsp = opts?["nsp"] as? String { diff --git a/SocketIOClientSwift/SocketLogger.swift b/SocketIOClientSwift/SocketLogger.swift index abef5d2..5071c02 100644 --- a/SocketIOClientSwift/SocketLogger.swift +++ b/SocketIOClientSwift/SocketLogger.swift @@ -25,19 +25,19 @@ import Foundation protocol SocketLogClient { - var log: Bool {get set} var logType: String {get} } final class SocketLogger { private static let printQueue = dispatch_queue_create("printQueue", DISPATCH_QUEUE_SERIAL) + static var log = false private static func toCVArgType(item: AnyObject) -> CVarArgType { return String(item) } static func log(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) { - if !client.log { + if !log { return } @@ -50,7 +50,7 @@ final class SocketLogger { } static func err(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) { - if !client.log { + if !log { return }