Add pingreq handler when active, not when handler is added

adam-fowler · adam-fowler · commit 7d343dadd745 · 2021-12-14T20:50:52.000Z
diff --git a/Sources/MQTTNIO/ChannelHandlers/MQTTMessageHandler.swift b/Sources/MQTTNIO/ChannelHandlers/MQTTMessageHandler.swift
@@ -35,10 +35,16 @@ class MQTTMessageHandler: ChannelDuplexHandler {
     }
 
     func handlerAdded(context: ChannelHandlerContext) {
+        if context.channel.isActive {
+            self.pingreqHandler?.start(context: context)
+        }
+    }
+
+    func channelActive(context: ChannelHandlerContext) {
         self.pingreqHandler?.start(context: context)
     }
 
-    func handlerRemoved(context: ChannelHandlerContext) {
+    func channelInactive(context: ChannelHandlerContext) {
         self.pingreqHandler?.stop()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,16 @@ class MQTTMessageHandler: ChannelDuplexHandler {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func handlerAdded(context: ChannelHandlerContext) {`
	`38`	`+ if context.channel.isActive {`
	`39`	`+ self.pingreqHandler?.start(context: context)`
	`40`	`+ }`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ func channelActive(context: ChannelHandlerContext) {`
`38`	`44`	`self.pingreqHandler?.start(context: context)`
`39`	`45`	`}`
`40`	`46`
`41`		`- func handlerRemoved(context: ChannelHandlerContext) {`
	`47`	`+ func channelInactive(context: ChannelHandlerContext) {`
`42`	`48`	`self.pingreqHandler?.stop()`
`43`	`49`	`}`
`44`	`50`