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

use static variable for log

Browse Source
This commit is contained in:
Erik 2015-08-18 10:19:58 -04:00
parent 2351637ab4
commit 4fdb49ea2f
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SocketIOClientSwift/SocketEngine.swift
View File

@ -64,7 +64,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
weak var client: SocketEngineClient? weak var client: SocketEngineClient?
var cookies: [NSHTTPCookie]? var cookies: [NSHTTPCookie]?
var log = false
var sid = "" var sid = ""
var socketPath = "" var socketPath = ""
var urlPolling: String? var urlPolling: String?
@ -94,7 +93,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false forceWebsockets = opts?["forceWebsockets"] as? Bool ?? false
forcePolling = opts?["forcePolling"] as? Bool ?? false forcePolling = opts?["forcePolling"] as? Bool ?? false
cookies = opts?["cookies"] as? [NSHTTPCookie] cookies = opts?["cookies"] as? [NSHTTPCookie]
log = opts?["log"] as? Bool ?? false
socketPath = opts?["path"] as? String ?? "" socketPath = opts?["path"] as? String ?? ""
extraHeaders = opts?["extraHeaders"] as? [String: String] extraHeaders = opts?["extraHeaders"] as? [String: String]
} }

3
SocketIOClientSwift/SocketIOClient.swift
View File

@ -35,7 +35,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
let logType = "SocketClient" let logType = "SocketClient"
var ackHandlers = SocketAckManager() var ackHandlers = SocketAckManager()
var currentAck = -1 var currentAck = -1
var log = false
var waitingData = [SocketPacket]() var waitingData = [SocketPacket]()
public let emitQueue = dispatch_queue_create("emitQueue", DISPATCH_QUEUE_SERIAL) 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 { if let log = opts?["log"] as? Bool {
self.log = log SocketLogger.log = log
} }
if let nsp = opts?["nsp"] as? String { if let nsp = opts?["nsp"] as? String {

6
SocketIOClientSwift/SocketLogger.swift
View File

@ -25,19 +25,19 @@
import Foundation import Foundation
protocol SocketLogClient { protocol SocketLogClient {
var log: Bool {get set}
var logType: String {get} var logType: String {get}
} }
final class SocketLogger { final class SocketLogger {
private static let printQueue = dispatch_queue_create("printQueue", DISPATCH_QUEUE_SERIAL) private static let printQueue = dispatch_queue_create("printQueue", DISPATCH_QUEUE_SERIAL)
static var log = false
private static func toCVArgType(item: AnyObject) -> CVarArgType { private static func toCVArgType(item: AnyObject) -> CVarArgType {
return String(item) return String(item)
} }
static func log(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) { static func log(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) {
if !client.log { if !log {
return return
} }
@ -50,7 +50,7 @@ final class SocketLogger {
} }
static func err(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) { static func err(message: String, client: SocketLogClient, altType: String? = nil, args: AnyObject...) {
if !client.log { if !log {
return return
} }