public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gardena] Adjust thread name for WEB clients (avoid IAE) (#14349)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2023-02-19 20:56:59 +01:00 committed by GitHub
parent e0a3ca2f9b
commit 8c09334943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
View File

@ -56,6 +56,8 @@ import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommand;
import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommandRequest; import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommandRequest;
import org.openhab.core.io.net.http.HttpClientFactory; import org.openhab.core.io.net.http.HttpClientFactory;
import org.openhab.core.io.net.http.WebSocketFactory; import org.openhab.core.io.net.http.WebSocketFactory;
import org.openhab.core.thing.ThingUID;
import org.openhab.core.thing.util.ThingWebClientUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -101,23 +103,24 @@ public class GardenaSmartImpl implements GardenaSmart, GardenaSmartWebSocketList
private final Object newDeviceTasksLock = new Object(); private final Object newDeviceTasksLock = new Object();
private final List<ScheduledFuture<?>> newDeviceTasks = new ArrayList<>(); private final List<ScheduledFuture<?>> newDeviceTasks = new ArrayList<>();
public GardenaSmartImpl(String id, GardenaConfig config, GardenaSmartEventListener eventListener, public GardenaSmartImpl(ThingUID uid, GardenaConfig config, GardenaSmartEventListener eventListener,
ScheduledExecutorService scheduler, HttpClientFactory httpClientFactory, WebSocketFactory webSocketFactory) ScheduledExecutorService scheduler, HttpClientFactory httpClientFactory, WebSocketFactory webSocketFactory)
throws GardenaException { throws GardenaException {
this.id = id; this.id = uid.getId();
this.config = config; this.config = config;
this.eventListener = eventListener; this.eventListener = eventListener;
this.scheduler = scheduler; this.scheduler = scheduler;
logger.debug("Starting GardenaSmart"); logger.debug("Starting GardenaSmart");
try { try {
httpClient = httpClientFactory.createHttpClient(id); String name = ThingWebClientUtil.buildWebClientConsumerName(uid, null);
httpClient = httpClientFactory.createHttpClient(name);
httpClient.setConnectTimeout(config.getConnectionTimeout() * 1000L); httpClient.setConnectTimeout(config.getConnectionTimeout() * 1000L);
httpClient.setIdleTimeout(httpClient.getConnectTimeout()); httpClient.setIdleTimeout(httpClient.getConnectTimeout());
httpClient.start(); httpClient.start();
String webSocketId = String.valueOf(hashCode()); name = ThingWebClientUtil.buildWebClientConsumerName(uid, "ws-");
webSocketClient = webSocketFactory.createWebSocketClient(webSocketId); webSocketClient = webSocketFactory.createWebSocketClient(name);
webSocketClient.setConnectTimeout(config.getConnectionTimeout() * 1000L); webSocketClient.setConnectTimeout(config.getConnectionTimeout() * 1000L);
webSocketClient.setStopTimeout(3000); webSocketClient.setStopTimeout(3000);
webSocketClient.setMaxIdleTimeout(150000); webSocketClient.setMaxIdleTimeout(150000);

3
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java
View File

@ -173,8 +173,7 @@ public class GardenaAccountHandler extends BaseBridgeHandler implements GardenaS
GardenaConfig gardenaConfig = getThing().getConfiguration().as(GardenaConfig.class); GardenaConfig gardenaConfig = getThing().getConfiguration().as(GardenaConfig.class);
logger.debug("{}", gardenaConfig); logger.debug("{}", gardenaConfig);
String id = getThing().getUID().getId(); gardenaSmart = new GardenaSmartImpl(getThing().getUID(), gardenaConfig, this, scheduler, httpClientFactory,
gardenaSmart = new GardenaSmartImpl(id, gardenaConfig, this, scheduler, httpClientFactory,
webSocketFactory); webSocketFactory);
final GardenaDeviceDiscoveryService discoveryService = this.discoveryService; final GardenaDeviceDiscoveryService discoveryService = this.discoveryService;
if (discoveryService != null) { if (discoveryService != null) {