2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -13,9 +13,7 @@ class Logger {
13
13
var fileLogger : DDFileLogger = DDFileLogger ( )
14
14
15
15
private init ( ) {
16
- if let tty = DDTTYLogger . sharedInstance {
17
- DDLog . add ( tty) // TTY = Xcode console
18
- }
16
+ DDLog . add ( DDOSLogger . sharedInstance)
19
17
fileLogger. rollingFrequency = TimeInterval ( 60 * 60 * 24 ) // 24 hours
20
18
fileLogger. logFileManager. maximumNumberOfLogFiles = 3
21
19
DDLog . add ( fileLogger)
@@ -37,9 +35,7 @@ class Logger {
37
35
}
38
36
39
37
static func log( _ msg: String , level: ClashLogLevel = . info) {
40
- DispatchQueue . global ( ) . async {
41
- shared. logToFile ( msg: " [ \( level. rawValue) ] \( msg) " , level: level)
42
- }
38
+ shared. logToFile ( msg: " [ \( level. rawValue) ] \( msg) " , level: level)
43
39
}
44
40
45
41
func logFilePath( ) -> String {
Original file line number Diff line number Diff line change @@ -23,6 +23,8 @@ class ApiRequest {
23
23
24
24
private var proxyRespCache : ClashProxyResp ?
25
25
26
+ private lazy var logQueue = DispatchQueue ( label: " com.ClashX.core.log " )
27
+
26
28
private init ( ) {
27
29
let configuration = URLSessionConfiguration . default
28
30
configuration. timeoutIntervalForRequest = 604800
@@ -293,11 +295,11 @@ extension ApiRequest {
293
295
294
296
let uriString = " /logs?level= " . appending ( ConfigManager . selectLoggingApiLevel. rawValue)
295
297
let socket = WebSocket ( url: URL ( string: ConfigManager . apiUrl. appending ( uriString) ) !)
296
-
297
298
for header in ApiRequest . authHeader ( ) {
298
299
socket. request. setValue ( header. value, forHTTPHeaderField: header. name)
299
300
}
300
301
socket. delegate = self
302
+ socket. callbackQueue = logQueue
301
303
socket. connect ( )
302
304
loggingWebSocket = socket
303
305
}
0 commit comments