From cb6e91277f8dad93a2f09d2f1d3efce35e9cd9e0 Mon Sep 17 00:00:00 2001
From: bdrlamb <bdrlamb@gmail.com>
Date: Mon, 27 Apr 2020 14:32:35 -0700
Subject: [PATCH] Fix MQTT inactivity disconnects

MQTT clients don't send PINGREQ messages if they've recently sent [UN]SUBSCRIBE/PUBLISH messages.  The MQTT server last activity timestamp is currently only updated in response to PINGREQ messages.  This causes the server to disconnect any clients that regularly send PUBLISH messages since they don't send PINGREQ.

This change adds reportActivity calls in response to PUBLISH, SUBSCRIBE and UNSUBSCRIBE in addition to PINGREQ.
---
 .../server/transport/mqtt/MqttTransportHandler.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 7295cb786b..d0f9c489cc 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -138,12 +138,24 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 break;
             case PUBLISH:
                 processPublish(ctx, (MqttPublishMessage) msg);
+                transportService.reportActivity(sessionInfo);
+                if (gatewaySessionHandler != null) {
+                    gatewaySessionHandler.reportActivity();
+                }
                 break;
             case SUBSCRIBE:
                 processSubscribe(ctx, (MqttSubscribeMessage) msg);
+                transportService.reportActivity(sessionInfo);
+                if (gatewaySessionHandler != null) {
+                    gatewaySessionHandler.reportActivity();
+                }
                 break;
             case UNSUBSCRIBE:
                 processUnsubscribe(ctx, (MqttUnsubscribeMessage) msg);
+                transportService.reportActivity(sessionInfo);
+                if (gatewaySessionHandler != null) {
+                    gatewaySessionHandler.reportActivity();
+                }
                 break;
             case PINGREQ:
                 if (checkConnected(ctx, msg)) {