demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[yioremote] Stop the web socket client when disposing thing handler (#14340)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2023-02-20 12:39:03 +01:00 committed by GitHub
parent 8306210a13
commit 1f877cae6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bundles/org.openhab.binding.yioremote/src/main/java/org/openhab/binding/yioremote/internal/YIOremoteDockHandler.java
View File

@ -68,6 +68,7 @@ public class YIOremoteDockHandler extends BaseThingHandler {
private ClientUpgradeRequest yioremoteDockwebSocketClientrequest = new ClientUpgradeRequest();
private @Nullable URI websocketAddress;
private YioRemoteDockHandleStatus yioRemoteDockActualStatus = YioRemoteDockHandleStatus.UNINITIALIZED_STATE;
private @Nullable Future<?> initJob;
private @Nullable Future<?> webSocketPollingJob;
private @Nullable Future<?> webSocketReconnectionPollingJob;
public String receivedMessage = "";
@ -90,7 +91,7 @@ public class YIOremoteDockHandler extends BaseThingHandler {
@Override
public void initialize() {
updateStatus(ThingStatus.UNKNOWN);
scheduler.execute(() -> {
initJob = scheduler.submit(() -> {
try {
websocketAddress = new URI("ws://" + localConfig.host + ":946");
yioRemoteDockActualStatus = YioRemoteDockHandleStatus.AUTHENTICATION_PROCESS;
@ -257,8 +258,18 @@ public class YIOremoteDockHandler extends BaseThingHandler {
@Override
public void dispose() {
Future<?> job = initJob;
if (job != null) {
job.cancel(true);
initJob = null;
}
disposeWebsocketPollingJob();
disposeWebSocketReconnectionPollingJob();
try {
webSocketClient.stop();
} catch (Exception e) {
logger.debug("Could not stop webSocketClient, message {}", e.getMessage());
}
}
@Override
@ -342,21 +353,19 @@ public class YIOremoteDockHandler extends BaseThingHandler {
}
private void disposeWebsocketPollingJob() {
if (webSocketPollingJob != null) {
if (!webSocketPollingJob.isCancelled() && webSocketPollingJob != null) {
webSocketPollingJob.cancel(true);
}
Future<?> job = webSocketPollingJob;
if (job != null) {
job.cancel(true);
webSocketPollingJob = null;
}
}
private void disposeWebSocketReconnectionPollingJob() {
if (webSocketReconnectionPollingJob != null) {
if (!webSocketReconnectionPollingJob.isCancelled() && webSocketReconnectionPollingJob != null) {
webSocketReconnectionPollingJob.cancel(true);
}
}
Future<?> job = webSocketReconnectionPollingJob;
if (job != null) {
job.cancel(true);
webSocketReconnectionPollingJob = null;
}
logger.debug("disposereconnection");
reconnectionCounter = 0;
}