diff --git a/Tun/Punchnet/Actors/SDLPuncherActor.swift b/Tun/Punchnet/Actors/SDLPuncherActor.swift index 3a94618..8d7879c 100644 --- a/Tun/Punchnet/Actors/SDLPuncherActor.swift +++ b/Tun/Punchnet/Actors/SDLPuncherActor.swift @@ -126,7 +126,7 @@ actor SDLPuncherActor { // 并行发送register请求 if peerInfo.hasV4Info { if let remoteAddress = try? await peerInfo.v4Info.socketAddress() { - SDLLogger.log("[SDLContext] hole sock address: \(remoteAddress)", for: .punchnet) + SDLLogger.log("[SDLContext] hole sock address: \(remoteAddress)", for: .debug) udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress) } else { SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v4Info", for: .debug) @@ -135,7 +135,7 @@ actor SDLPuncherActor { if peerInfo.hasV6Info { if let remoteAddress = try? await peerInfo.v6Info.socketAddress() { - SDLLogger.log("[SDLContext] hole sock address v6: \(remoteAddress)", for: .punchnet) + SDLLogger.log("[SDLContext] hole sock address v6: \(remoteAddress)", for: .debug) udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress) } else { SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v6Info", for: .debug) diff --git a/Tun/Punchnet/Actors/SDLSupervisor.swift b/Tun/Punchnet/Actors/SDLSupervisor.swift index 16969fc..38980f8 100644 --- a/Tun/Punchnet/Actors/SDLSupervisor.swift +++ b/Tun/Punchnet/Actors/SDLSupervisor.swift @@ -16,7 +16,7 @@ actor SDLSupervisor { } catch is CancellationError { break } catch let err { - SDLLogger.log("[Supervisor] worker \(name) crashed: \(err.localizedDescription)", for: .punchnet) + SDLLogger.log("[Supervisor] worker \(name) crashed: \(err.localizedDescription)", for: .debug) try? await Task.sleep(for: retryDelay) } } diff --git a/Tun/Punchnet/SDLLogger.swift b/Tun/Punchnet/SDLLogger.swift index 9b586dd..c003261 100644 --- a/Tun/Punchnet/SDLLogger.swift +++ b/Tun/Punchnet/SDLLogger.swift @@ -10,7 +10,6 @@ import os public class SDLLogger: @unchecked Sendable { public enum Subsystem: String, CaseIterable { - case punchnet = "com.jihe.punchnet" case debug = "com.jihe.punchnet.debug" case trace = "com.jihe.punchnet.trace" } @@ -33,7 +32,7 @@ public class SDLLogger: @unchecked Sendable { self.log.info("\(message, privacy: .public)") } - public static func log(_ message: String, for system: Subsystem = .punchnet) { + public static func log(_ message: String, for system: Subsystem = .debug) { if let logger = loggers[system.rawValue] { logger._log(message) } diff --git a/Tun/Punchnet/SDLUDPHole.swift b/Tun/Punchnet/SDLUDPHole.swift index 34fcbdf..b179b05 100644 --- a/Tun/Punchnet/SDLUDPHole.swift +++ b/Tun/Punchnet/SDLUDPHole.swift @@ -57,12 +57,15 @@ final class SDLUDPHole: ChannelInboundHandler { func waitClose() async throws { switch self.state { case .idle: + SDLLogger.log("[SDLUDPHole] waitClose11", for: .debug) return case .ready, .stopping, .stopped: guard let closeFuture = self.closeFuture else { + SDLLogger.log("[SDLUDPHole] waitClose22", for: .debug) return } try await closeFuture.get() + SDLLogger.log("[SDLUDPHole] waitClose33", for: .debug) } }