dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved PR comments

Browse Source
This commit is contained in:
Artem Barysh 2025-06-02 16:21:35 +03:00
parent e112077cb0
commit 9786e0a2f8
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
View File

@ -96,6 +96,8 @@ final class MqttClientImpl implements MqttClient {
private final ListeningExecutor handlerExecutor; private final ListeningExecutor handlerExecutor;
private final static int DISCONNECT_FALLBACK_DELAY_SECS = 1;
/** /**
* Construct the MqttClientImpl with default config * Construct the MqttClientImpl with default config
*/ */
@ -468,13 +470,13 @@ final class MqttClientImpl implements MqttClient {
future.channel().close(); future.channel().close();
disconnected = true; disconnected = true;
}); });
eventLoop.schedule(() -> { eventLoop.schedule(() -> {
if (channel.isOpen()) { if (channel.isOpen()) {
log.trace("[{}] Channel still open after {} second; forcing close now", channel.id(), DISCONNECT_FALLBACK_DELAY_SECS);
this.channel.close(); this.channel.close();
disconnected = true; disconnected = true;
} }
}, 1, TimeUnit.SECONDS); }, DISCONNECT_FALLBACK_DELAY_SECS, TimeUnit.SECONDS);
} }
} }

16
netty-mqtt/src/test/java/org/thingsboard/mqtt/MqttClientTest.java
View File

@ -123,22 +123,12 @@ class MqttClientTest {
void testDisconnectFromBroker() { void testDisconnectFromBroker() {
// GIVEN // GIVEN
var clientConfig = new MqttClientConfig(); var clientConfig = new MqttClientConfig();
clientConfig.setOwnerId("Test[ConnectToBroker]"); clientConfig.setOwnerId("Test[Disconnect]");
clientConfig.setClientId("connect"); clientConfig.setClientId("disconnect");
client = MqttClient.create(clientConfig, null, handlerExecutor); client = MqttClient.create(clientConfig, null, handlerExecutor);
// WHEN connect(broker.getHost(), broker.getMqttPort());
Promise<MqttConnectResult> connectFuture = client.connect(broker.getHost(), broker.getMqttPort());
// THEN
assertThat(connectFuture).isNotNull();
Awaitility.await("waiting for client to connect")
.atMost(Duration.ofSeconds(10L))
.until(connectFuture::isDone);
assertThat(connectFuture.isSuccess()).isTrue();
// WHEN // WHEN
client.disconnect(); client.disconnect();