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

[touchwand] Add port configuration to websocket (#13440)

Browse Source 
* add port configuration to websocket

Signed-off-by: Roie Geron <roie.geron@gmail.com>
This commit is contained in:
Roie Geron
2022-09-26 20:05:50 +03:00
committed by GitHub
parent 517fe44b36
commit 58168c205f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandBridgeHandler.java
View File

@@ -85,7 +85,7 @@ public class TouchWandBridgeHandler extends BaseBridgeHandler implements TouchWa
updateStatus(ThingStatus.ONLINE); updateStatus(ThingStatus.ONLINE);
synchronized (this) { synchronized (this) {
if (isRunning) { if (isRunning) {
TouchWandWebSockets localSockets = touchWandWebSockets = new TouchWandWebSockets(host, TouchWandWebSockets localSockets = touchWandWebSockets = new TouchWandWebSockets(host, port,
scheduler); scheduler);
localSockets.registerListener(this); localSockets.registerListener(this);
localSockets.connect(); localSockets.connect();

6
bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/TouchWandWebSockets.java
View File

@@ -59,6 +59,7 @@ public class TouchWandWebSockets {
private WebSocketClient client; private WebSocketClient client;
private String controllerAddress; private String controllerAddress;
private int port;
private TouchWandSocket touchWandSocket; private TouchWandSocket touchWandSocket;
private boolean isShutDown = false; private boolean isShutDown = false;
private CopyOnWriteArraySet<TouchWandUnitStatusUpdateListener> listeners = new CopyOnWriteArraySet<>(); private CopyOnWriteArraySet<TouchWandUnitStatusUpdateListener> listeners = new CopyOnWriteArraySet<>();
@@ -67,17 +68,18 @@ public class TouchWandWebSockets {
private ScheduledExecutorService scheduler; private ScheduledExecutorService scheduler;
public TouchWandWebSockets(String ipAddress, ScheduledExecutorService scheduler) { public TouchWandWebSockets(String ipAddress, int port, ScheduledExecutorService scheduler) {
client = new WebSocketClient(); client = new WebSocketClient();
touchWandSocket = new TouchWandSocket(); touchWandSocket = new TouchWandSocket();
this.controllerAddress = ipAddress; this.controllerAddress = ipAddress;
this.port = port;
this.scheduler = scheduler; this.scheduler = scheduler;
socketReconnect = null; socketReconnect = null;
} }
public void connect() { public void connect() {
try { try {
uri = new URI("ws://" + controllerAddress + WS_ENDPOINT_TOUCHWAND); uri = new URI("ws://" + controllerAddress + ":" + String.valueOf(port) + WS_ENDPOINT_TOUCHWAND);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
logger.warn("URI not valid {} message {}", uri, e.getMessage()); logger.warn("URI not valid {} message {}", uri, e.getMessage());
return; return;