Skip to content

Commit ea6bc32

Browse files
committed
Logging changes
packets are reported using trace report connection established/closed
1 parent 53d1deb commit ea6bc32

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Sources/MQTTNIO/MQTTChannelHandlers.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final class MQTTEncodeHandler: ChannelOutboundHandler {
1414

1515
func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
1616
let message = unwrapOutboundIn(data)
17-
self.client.logger.debug("MQTT Out", metadata: ["mqtt_message": .string("\(message)"), "mqtt_packet_id": .string("\(message.packetId)")])
17+
self.client.logger.trace("MQTT Out", metadata: ["mqtt_message": .string("\(message)"), "mqtt_packet_id": .string("\(message.packetId)")])
1818
var bb = context.channel.allocator.buffer(capacity: 0)
1919
do {
2020
try message.write(version: self.client.configuration.version, to: &bb)
@@ -46,7 +46,7 @@ struct ByteToMQTTMessageDecoder: ByteToMessageDecoder {
4646
let publishMessage = try MQTTPublishPacket.read(version: self.client.configuration.version, from: packet)
4747
// let publish = try MQTTSerializer.readPublish(from: packet)
4848
// let publishMessage = MQTTPublishPacket(publish: publish.publishInfo, packetId: publish.packetId)
49-
self.client.logger.debug("MQTT In", metadata: [
49+
self.client.logger.trace("MQTT In", metadata: [
5050
"mqtt_message": .string("\(publishMessage)"),
5151
"mqtt_packet_id": .string("\(publishMessage.packetId)"),
5252
"mqtt_topicName": .string("\(publishMessage.publish.topicName)"),
@@ -80,7 +80,7 @@ struct ByteToMQTTMessageDecoder: ByteToMessageDecoder {
8080
default:
8181
throw MQTTError.decodeError
8282
}
83-
self.client.logger.debug("MQTT In", metadata: ["mqtt_message": .string("\(message)"), "mqtt_packet_id": .string("\(message.packetId)")])
83+
self.client.logger.trace("MQTT In", metadata: ["mqtt_message": .string("\(message)"), "mqtt_packet_id": .string("\(message.packetId)")])
8484
context.fireChannelRead(wrapInboundOut(message))
8585
} catch InternalError.incompletePacket {
8686
return .needMoreData

Sources/MQTTNIO/MQTTClient.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,10 @@ extension MQTTClient {
312312
if self.connection === connection {
313313
self.connection = nil
314314
}
315+
self.logger.debug("Network connection closed")
315316
self.closeListeners.notify(result)
316317
}
318+
self.logger.debug("Network connection established")
317319
return connection.sendMessage(packet) { message -> Bool in
318320
guard message.type == .CONNACK || message.type == .AUTH else { throw MQTTError.failedToConnect }
319321
return true

0 commit comments

Comments
 (0)