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

Merge with rc

Browse Source
This commit is contained in:
Igor Kulikov 2025-07-24 12:57:02 +03:00
commit 82fe6a0d18
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,19 +462,18 @@ final class MqttClientImpl implements MqttClient {
return; return;
} }
disconnected = true;
log.trace("[{}] Disconnecting from server", channel != null ? channel.id() : "UNKNOWN"); log.trace("[{}] Disconnecting from server", channel != null ? channel.id() : "UNKNOWN");
if (this.channel != null) { if (this.channel != null) {
MqttMessage message = new MqttMessage(new MqttFixedHeader(MqttMessageType.DISCONNECT, false, MqttQoS.AT_MOST_ONCE, false, 0)); MqttMessage message = new MqttMessage(new MqttFixedHeader(MqttMessageType.DISCONNECT, false, MqttQoS.AT_MOST_ONCE, false, 0));
sendAndFlushPacket(message).addListener((ChannelFutureListener) future -> { sendAndFlushPacket(message).addListener((ChannelFutureListener) future -> {
future.channel().close(); future.channel().close();
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); log.trace("[{}] Channel still open after {} second; forcing close now", channel.id(), DISCONNECT_FALLBACK_DELAY_SECS);
this.channel.close(); this.channel.close();
disconnected = true;
} }
}, DISCONNECT_FALLBACK_DELAY_SECS, TimeUnit.SECONDS); }, DISCONNECT_FALLBACK_DELAY_SECS, TimeUnit.SECONDS);
} }

2
packaging/java/build.gradle
View File

@ -92,7 +92,7 @@ buildRpm {
archiveVersion = projectVersion.replace('-', '') archiveVersion = projectVersion.replace('-', '')
archiveFileName = "${pkgName}.rpm" archiveFileName = "${pkgName}.rpm"
requires("java-17") requires("(java-17 or java-17-headless or jre-17 or jre-17-headless)") // .or() notation does work in RPM plugin
from("${buildDir}/conf") { from("${buildDir}/conf") {
include "${pkgName}.conf" include "${pkgName}.conf"