From 4625f93d9c32a0bf02f5982cf63ce389be72e8fd Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 17 Apr 2019 13:01:29 +0300 Subject: [PATCH] Revert "Added MQTT keep-alive parameter" --- application/src/main/resources/thingsboard.yml | 1 - .../server/transport/mqtt/MqttTransportService.java | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 73a017195b..7fa01ccc05 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -469,7 +469,6 @@ transport: boss_group_thread_count: "${NETTY_BOSS_GROUP_THREADS:1}" worker_group_thread_count: "${NETTY_WORKER_GROUP_THREADS:12}" max_payload_size: "${NETTY_MAX_PAYLOAD_SIZE:65536}" - so_keep_alive: "${NETTY_SO_KEEPALIVE:true}" # MQTT SSL configuration ssl: # Enable/disable SSL support diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java index d7a8583a45..752a8e6192 100644 --- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java +++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java @@ -17,7 +17,6 @@ package org.thingsboard.server.transport.mqtt; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; -import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; @@ -51,8 +50,6 @@ public class MqttTransportService { private Integer bossGroupThreadCount; @Value("${transport.mqtt.netty.worker_group_thread_count}") private Integer workerGroupThreadCount; - @Value("${transport.mqtt.netty.so_keep_alive}") - private boolean keepAlive; @Autowired private MqttTransportContext context; @@ -72,8 +69,7 @@ public class MqttTransportService { ServerBootstrap b = new ServerBootstrap(); b.group(bossGroup, workerGroup) .channel(NioServerSocketChannel.class) - .childHandler(new MqttTransportServerInitializer(context)) - .childOption(ChannelOption.SO_KEEPALIVE, keepAlive); + .childHandler(new MqttTransportServerInitializer(context)); serverChannel = b.bind(host, port).sync().channel(); log.info("Mqtt transport started!");