anlicheng/punchnet-macos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix logger

Browse Source
This commit is contained in:
anlicheng 2026-04-15 16:01:21 +08:00
parent f06a97ff50
commit 2f0f1f6c7c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tun/Punchnet/Actors/SDLPuncherActor.swift
View File

@ -126,7 +126,7 @@ actor SDLPuncherActor {
// 并行发送register请求 // 并行发送register请求
if peerInfo.hasV4Info { if peerInfo.hasV4Info {
if let remoteAddress = try? await peerInfo.v4Info.socketAddress() { 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) udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress)
} else { } else {
SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v4Info", for: .debug) SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v4Info", for: .debug)
@ -135,7 +135,7 @@ actor SDLPuncherActor {
if peerInfo.hasV6Info { if peerInfo.hasV6Info {
if let remoteAddress = try? await peerInfo.v6Info.socketAddress() { 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) udpHole.send(type: .register, data: registerData, remoteAddress: remoteAddress)
} else { } else {
SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v6Info", for: .debug) SDLLogger.log("[SDLPuncherActor] failed to resolve peerInfo.v6Info", for: .debug)

2
Tun/Punchnet/Actors/SDLSupervisor.swift
View File

@ -16,7 +16,7 @@ actor SDLSupervisor {
} catch is CancellationError { } catch is CancellationError {
break break
} catch let err { } 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) try? await Task.sleep(for: retryDelay)
} }
} }

3
Tun/Punchnet/SDLLogger.swift
View File

@ -10,7 +10,6 @@ import os
public class SDLLogger: @unchecked Sendable { public class SDLLogger: @unchecked Sendable {
public enum Subsystem: String, CaseIterable { public enum Subsystem: String, CaseIterable {
case punchnet = "com.jihe.punchnet"
case debug = "com.jihe.punchnet.debug" case debug = "com.jihe.punchnet.debug"
case trace = "com.jihe.punchnet.trace" case trace = "com.jihe.punchnet.trace"
} }
@ -33,7 +32,7 @@ public class SDLLogger: @unchecked Sendable {
self.log.info("\(message, privacy: .public)") 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] { if let logger = loggers[system.rawValue] {
logger._log(message) logger._log(message)
} }

3
Tun/Punchnet/SDLUDPHole.swift
View File

@ -57,12 +57,15 @@ final class SDLUDPHole: ChannelInboundHandler {
func waitClose() async throws { func waitClose() async throws {
switch self.state { switch self.state {
case .idle: case .idle:
SDLLogger.log("[SDLUDPHole] waitClose11", for: .debug)
return return
case .ready, .stopping, .stopped: case .ready, .stopping, .stopped:
guard let closeFuture = self.closeFuture else { guard let closeFuture = self.closeFuture else {
SDLLogger.log("[SDLUDPHole] waitClose22", for: .debug)
return return
} }
try await closeFuture.get() try await closeFuture.get()
SDLLogger.log("[SDLUDPHole] waitClose33", for: .debug)
} }
} }