Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30fb5d8b27 | ||
|
|
cd680abe55 | ||
|
|
b014494819 |
@@ -921,14 +921,14 @@ class ConnectionHandler: ChannelInboundHandler {
|
||||
if let natsErr = error as? NatsErrorProtocol {
|
||||
self.fire(.error(natsErr))
|
||||
} else {
|
||||
logger.error("unexpected error: \(error)")
|
||||
// 降级为 debug 级别,避免频繁输出错误日志
|
||||
// uncleanShutdown 是常见的 TLS 关闭情况,不需要作为错误处理
|
||||
logger.debug("Channel error (will reconnect if needed): \(error)")
|
||||
}
|
||||
|
||||
// Unified handling: use handleDisconnect for all non-closed/non-disconnected states
|
||||
let currentState = state.withLockedValue { $0 }
|
||||
if currentState != .closed && currentState != .disconnected {
|
||||
handleDisconnect()
|
||||
}
|
||||
// 注意:不在这里调用 handleDisconnect
|
||||
// context.close() 会触发 channelInactive,由它负责处理断开逻辑
|
||||
// 这样可以避免重复处理和过度重连
|
||||
}
|
||||
|
||||
func handleDisconnect() {
|
||||
@@ -987,7 +987,8 @@ class ConnectionHandler: ChannelInboundHandler {
|
||||
try result.get()
|
||||
self.fire(.disconnected)
|
||||
} catch {
|
||||
logger.error("Error closing connection: \(error)")
|
||||
// 降级为 debug:网络断开时 TLS 无法完成正常关闭握手是预期行为
|
||||
logger.debug("Connection closed with error (will reconnect): \(error)")
|
||||
}
|
||||
// Only start reconnect after disconnect is complete
|
||||
self.handleReconnect()
|
||||
@@ -1056,6 +1057,14 @@ class ConnectionHandler: ChannelInboundHandler {
|
||||
|
||||
func write(operation: ClientOp) async throws {
|
||||
guard let buffer = self.batchBuffer else {
|
||||
// If state is connected but batchBuffer is nil, this is a "fake connection" state
|
||||
// Trigger reconnect to recover
|
||||
let currentState = state.withLockedValue { $0 }
|
||||
if currentState == .connected {
|
||||
// 降级为 debug:这是断网恢复场景的正常状态
|
||||
logger.debug("Write failed: batchBuffer is nil, triggering reconnect")
|
||||
handleDisconnect()
|
||||
}
|
||||
throw NatsError.ClientError.invalidConnection("not connected")
|
||||
}
|
||||
do {
|
||||
@@ -1064,7 +1073,8 @@ class ConnectionHandler: ChannelInboundHandler {
|
||||
// Trigger reconnect on write failure - connection may be broken
|
||||
let currentState = state.withLockedValue { $0 }
|
||||
if currentState == .connected {
|
||||
logger.error("Write operation failed, triggering reconnect: \(error)")
|
||||
// 降级为 debug:网络断开时写入失败是预期行为
|
||||
logger.debug("Write operation failed, triggering reconnect: \(error)")
|
||||
handleDisconnect()
|
||||
}
|
||||
throw NatsError.ClientError.io(error)
|
||||
|
||||
Reference in New Issue
Block a user