improve log performance

choetin · Apr 7, 2020 · ac5f5cf · ac5f5cf
1 parent 96a2470
commit ac5f5cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ClashX/Basic/Logger.swift b/ClashX/Basic/Logger.swift
@@ -13,9 +13,7 @@ class Logger {
     var fileLogger: DDFileLogger = DDFileLogger()
 
     private init() {
-        if let tty = DDTTYLogger.sharedInstance {
-            DDLog.add(tty) // TTY = Xcode console
-        }
+        DDLog.add(DDOSLogger.sharedInstance)
         fileLogger.rollingFrequency = TimeInterval(60 * 60 * 24) // 24 hours
         fileLogger.logFileManager.maximumNumberOfLogFiles = 3
         DDLog.add(fileLogger)
@@ -37,9 +35,7 @@ class Logger {
     }
 
     static func log(_ msg: String, level: ClashLogLevel = .info) {
-        DispatchQueue.global().async {
-            shared.logToFile(msg: "[\(level.rawValue)] \(msg)", level: level)
-        }
+        shared.logToFile(msg: "[\(level.rawValue)] \(msg)", level: level)
     }
 
     func logFilePath() -> String {

diff --git a/ClashX/General/ApiRequest.swift b/ClashX/General/ApiRequest.swift
@@ -23,6 +23,8 @@ class ApiRequest {
 
     private var proxyRespCache: ClashProxyResp?
 
+    private lazy var logQueue = DispatchQueue(label: "com.ClashX.core.log")
+
     private init() {
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = 604800
@@ -293,11 +295,11 @@ extension ApiRequest {
 
         let uriString = "/logs?level=".appending(ConfigManager.selectLoggingApiLevel.rawValue)
         let socket = WebSocket(url: URL(string: ConfigManager.apiUrl.appending(uriString))!)
-
         for header in ApiRequest.authHeader() {
             socket.request.setValue(header.value, forHTTPHeaderField: header.name)
         }
         socket.delegate = self
+        socket.callbackQueue = logQueue
         socket.connect()
         loggingWebSocket = socket
     }