Skip to content

Commit fb54c2b

Browse files
lsiepellsiepel
authored
Normalize thread names (openhab#17804)
Signed-off-by: Leo Siepel <[email protected]>
1 parent 5829b90 commit fb54c2b

File tree

30 files changed

+73
-53
lines changed

30 files changed

+73
-53
lines changed

‎bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/googletv/GoogleTVConnectionManager.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -579,15 +579,17 @@ public void connect() {
579579
logger.trace("{} - Starting Reader Thread for {}:{}", handler.getThingID(), config.ipAddress,
580580
config.googletvPort);
581581

582-
Thread readerThread = new Thread(this::readerThreadJob, "GoogleTV reader " + handler.getThingID());
582+
Thread readerThread = new Thread(this::readerThreadJob,
583+
"OH-binding-" + handler.getThingUID() + "-GoogleTVReader");
583584
readerThread.setDaemon(true);
584585
readerThread.start();
585586
this.readerThread = readerThread;
586587

587588
logger.trace("{} - Starting Sender Thread for {}:{}", handler.getThingID(), config.ipAddress,
588589
config.googletvPort);
589590

590-
Thread senderThread = new Thread(this::senderThreadJob, "GoogleTV sender " + handler.getThingID());
591+
Thread senderThread = new Thread(this::senderThreadJob,
592+
"OH-binding-" + handler.getThingUID() + "-GoogleTVSender");
591593
senderThread.setDaemon(true);
592594
senderThread.start();
593595
this.senderThread = senderThread;
@@ -698,12 +700,14 @@ public void shimInitialize() {
698700
this.shimServerSocket = serverSocket;
699701
this.shimQueue.clear();
700702

701-
Thread readerThread = new Thread(this::shimReaderThreadJob, "GoogleTV shim reader");
703+
Thread readerThread = new Thread(this::shimReaderThreadJob,
704+
"OH-binding-" + handler.getThingUID() + "-GoogleTVShimReader");
702705
readerThread.setDaemon(true);
703706
readerThread.start();
704707
this.shimReaderThread = readerThread;
705708

706-
Thread senderThread = new Thread(this::shimSenderThreadJob, "GoogleTV shim sender");
709+
Thread senderThread = new Thread(this::shimSenderThreadJob,
710+
"OH-binding-" + handler.getThingUID() + "-GoogleTVShimSender");
707711
senderThread.setDaemon(true);
708712
senderThread.start();
709713
this.shimSenderThread = senderThread;

‎bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/shieldtv/ShieldTVConnectionManager.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,14 @@ public void connect() {
443443

444444
setStatus(false, "offline.initializing");
445445

446-
Thread readerThread = new Thread(this::readerThreadJob, "ShieldTV reader " + handler.getThingID());
446+
Thread readerThread = new Thread(this::readerThreadJob,
447+
"OH-binding-" + handler.getThingUID() + "-ShieldTVReader");
447448
readerThread.setDaemon(true);
448449
readerThread.start();
449450
this.readerThread = readerThread;
450451

451-
Thread senderThread = new Thread(this::senderThreadJob, "ShieldTV sender " + handler.getThingID());
452+
Thread senderThread = new Thread(this::senderThreadJob,
453+
"OH-binding-" + handler.getThingUID() + "-ShieldTVSender");
452454
senderThread.setDaemon(true);
453455
senderThread.start();
454456
this.senderThread = senderThread;
@@ -513,13 +515,13 @@ public void shimInitialize() {
513515
this.shimServerSocket = serverSocket;
514516

515517
Thread readerThread = new Thread(this::shimReaderThreadJob,
516-
"ShieldTV shim reader " + handler.getThingID());
518+
"OH-binding-" + handler.getThingUID() + "-ShieldTVShimReader");
517519
readerThread.setDaemon(true);
518520
readerThread.start();
519521
this.shimReaderThread = readerThread;
520522

521523
Thread senderThread = new Thread(this::shimSenderThreadJob,
522-
"ShieldTV shim sender" + handler.getThingID());
524+
"OH-binding-" + handler.getThingUID() + "-ShieldTVShimSender");
523525
senderThread.setDaemon(true);
524526
senderThread.start();
525527
this.shimSenderThread = senderThread;

‎bundles/org.openhab.binding.anthem/src/main/java/org/openhab/binding/anthem/internal/handler/AnthemHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ private synchronized void connect() {
242242
scheduleConnectRetry(reconnectIntervalMinutes);
243243
return;
244244
}
245-
Thread localReaderThread = new Thread(this::readerThreadJob, "Anthem reader");
245+
Thread localReaderThread = new Thread(this::readerThreadJob, "OH-binding-" + getThing().getUID() + "-Reader");
246246
localReaderThread.setDaemon(true);
247247
localReaderThread.start();
248248
this.readerThread = localReaderThread;
249249

250-
Thread localSenderThread = new Thread(this::senderThreadJob, "Anthem sender");
250+
Thread localSenderThread = new Thread(this::senderThreadJob, "OH-binding-" + getThing().getUID() + "-Sender");
251251
localSenderThread.setDaemon(true);
252252
localSenderThread.start();
253253
this.senderThread = localSenderThread;

‎bundles/org.openhab.binding.argoclima/src/main/java/org/openhab/binding/argoclima/internal/device/passthrough/RemoteArgoApiServerStub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public synchronized void start() throws ArgoRemoteServerStubStartupException {
290290
// to stop, actually)
291291
s.setStopTimeout(1000L);
292292
try {
293-
new Thread() {
293+
new Thread("OH-binding-" + this.id + "-APIStub") {
294294
@Override
295295
public void run() {
296296
try {

‎bundles/org.openhab.binding.echonetlite/src/main/java/org/openhab/binding/echonetlite/internal/EchonetLiteBridgeHandler.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public class EchonetLiteBridgeHandler extends BaseBridgeHandler {
5252
private final ArrayBlockingQueue<Message> requests = new ArrayBlockingQueue<>(1024);
5353
private final Map<InstanceKey, EchonetObject> devicesByKey = new HashMap<>();
5454
private final EchonetMessageBuilder messageBuilder = new EchonetMessageBuilder();
55-
private final Thread networkingThread = new Thread(this::poll);
55+
private final Thread networkingThread = new Thread(this::poll,
56+
"OH-binding-" + EchonetLiteBindingConstants.BINDING_ID);
5657
private final EchonetMessage echonetMessage = new EchonetMessage();
5758
private final MonotonicClock clock = new MonotonicClock();
5859

@@ -76,8 +77,6 @@ private void start(final InstanceKey managementControllerKey, InstanceKey discov
7677
logger.debug("Binding echonet channel");
7778
echonetChannel = new EchonetChannel(discoveryKey.address);
7879
logger.debug("Starting networking thread");
79-
80-
networkingThread.setName("OH-binding-" + EchonetLiteBindingConstants.BINDING_ID);
8180
networkingThread.setDaemon(true);
8281
networkingThread.start();
8382
}

‎bundles/org.openhab.binding.ekey/src/main/java/org/openhab/binding/ekey/internal/handler/EkeyHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ public void initialize() {
8282

8383
scheduler.submit(() -> {
8484
populateChannels(config.protocol);
85-
String readerThreadName = "OH-binding-" + getThing().getUID().getAsString();
8685

8786
EkeyUdpPacketReceiver localReceiver = receiver = new EkeyUdpPacketReceiver(
88-
Objects.requireNonNullElse(config.natIp, config.ipAddress), config.port, readerThreadName);
87+
Objects.requireNonNullElse(config.natIp, config.ipAddress), config.port,
88+
"OH-binding-" + getThing().getUID());
8989
localReceiver.addEkeyPacketListener(this);
9090
try {
9191
localReceiver.openConnection();

‎bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/connection/Clip2Bridge.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ public void onFailure(@Nullable Session session, @Nullable Throwable failure) {
397397
public void onGoAway(@Nullable Session session, @Nullable GoAwayFrame frame) {
398398
Objects.requireNonNull(session);
399399
if (session.equals(http2Session)) {
400-
Thread recreateThread = new Thread(() -> recreateSession());
400+
Thread recreateThread = new Thread(() -> recreateSession(),
401+
"OH-binding-" + bridgeHandler.getThing().getUID() + "-RecreateSession");
401402
Clip2Bridge.this.recreateThread = recreateThread;
402403
recreateThread.start();
403404
}

‎bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/transport/LegacyPort.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import org.eclipse.jdt.annotation.NonNullByDefault;
2424
import org.eclipse.jdt.annotation.Nullable;
25+
import org.openhab.binding.insteon.internal.InsteonBindingConstants;
2526
import org.openhab.binding.insteon.internal.InsteonLegacyBindingConstants;
2627
import org.openhab.binding.insteon.internal.config.InsteonLegacyNetworkConfiguration;
2728
import org.openhab.binding.insteon.internal.device.InsteonAddress;
@@ -178,9 +179,9 @@ public void start() {
178179
}
179180

180181
readThread = new Thread(reader);
181-
setParamsAndStart(readThread, "Reader");
182+
setParamsAndStart(readThread, "OH-binding-" + InsteonBindingConstants.BINDING_ID + "-LegacyReader");
182183
writeThread = new Thread(writer);
183-
setParamsAndStart(writeThread, "Writer");
184+
setParamsAndStart(writeThread, "OH-binding-" + InsteonBindingConstants.BINDING_ID + "-LegacyWriter");
184185

185186
if (!mdbb.isComplete()) {
186187
modem.initialize();

‎bundles/org.openhab.binding.intesis/src/main/java/org/openhab/binding/intesis/internal/handler/IntesisBoxHandler.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,8 @@ public void initialize() {
9393
if (!config.ipAddress.isEmpty()) {
9494
updateStatus(ThingStatus.UNKNOWN);
9595
scheduler.submit(() -> {
96-
97-
String readerThreadName = "OH-binding-" + getThing().getUID().getAsString();
98-
9996
IntesisBoxSocketApi intesisLocalApi = intesisBoxSocketApi = new IntesisBoxSocketApi(config.ipAddress,
100-
config.port, readerThreadName);
97+
config.port, "OH-binding-" + getThing().getUID());
10198
intesisLocalApi.addIntesisBoxChangeListener(this);
10299
try {
103100
intesisLocalApi.openConnection();

‎bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactTransceiver.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.Set;
3333
import java.util.concurrent.locks.ReentrantLock;
3434

35+
import org.openhab.binding.keba.internal.KebaBindingConstants;
3536
import org.openhab.core.thing.ThingStatus;
3637
import org.openhab.core.thing.ThingStatusDetail;
3738
import org.slf4j.Logger;
@@ -71,7 +72,8 @@ public void start() {
7172
selector = Selector.open();
7273

7374
if (transceiverThread == null) {
74-
transceiverThread = new Thread(transceiverRunnable, "OH-binding-Keba-Transceiver");
75+
transceiverThread = new Thread(transceiverRunnable,
76+
"OH-binding-" + KebaBindingConstants.BINDING_ID + "-Transceiver");
7577
transceiverThread.start();
7678
}
7779

‎bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/security/LxWsSecurity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void authenticate(BiConsumer<LxErrorCode, String> doneCallback) {
8686
authenticationLock.unlock();
8787
}
8888
};
89-
new Thread(init).start();
89+
new Thread(init, "OH-binding-" + thingHandler.getThingId() + "-Authenticate").start();
9090
}
9191

9292
/**

‎bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/IPBridgeHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private synchronized void connect() {
216216
sendCommand(new LIPCommand(TargetType.BRIDGE, LutronOperation.QUERY, LutronCommandType.SYSTEM, null,
217217
SYSTEM_DBEXPORTDATETIME));
218218

219-
messageSender = new Thread(this::sendCommandsThread, "Lutron sender");
219+
messageSender = new Thread(this::sendCommandsThread, "OH-binding-" + getThing().getUID() + "-IPBridgeSender");
220220
messageSender.start();
221221

222222
logger.debug("Starting keepAlive job with interval {}", heartbeatInterval);

‎bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/LeapBridgeHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ private synchronized void connect() {
304304

305305
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, STATUS_INITIALIZING);
306306

307-
Thread readerThread = new Thread(this::readerThreadJob, "Lutron reader");
307+
Thread readerThread = new Thread(this::readerThreadJob, "OH-binding-" + getThing().getUID() + "-BridgeReader");
308308
readerThread.setDaemon(true);
309309
readerThread.start();
310310
this.readerThread = readerThread;
311311

312-
Thread senderThread = new Thread(this::senderThreadJob, "Lutron sender");
312+
Thread senderThread = new Thread(this::senderThreadJob, "OH-binding-" + getThing().getUID() + "-BridgeSender");
313313
senderThread.setDaemon(true);
314314
senderThread.start();
315315
this.senderThread = senderThread;

‎bundles/org.openhab.binding.luxom/src/main/java/org/openhab/binding/luxom/internal/handler/LuxomBridgeHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void startProcessing() {
139139

140140
updateStatus(ThingStatus.ONLINE);
141141

142-
messageSender = new Thread(this::sendCommandsThread, "Luxom sender");
142+
messageSender = new Thread(this::sendCommandsThread, "OH-binding-" + getThing().getUID() + "-Sender");
143143
messageSender.start();
144144

145145
logger.debug("Starting heartbeat job with interval {} (seconds)", HEARTBEAT_INTERVAL_SECONDS);

‎bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ private synchronized void startAutomaticRefresh() {
340340
pollingJob = scheduler.scheduleWithFixedDelay(this::refreshData, 0, refreshInterval, TimeUnit.SECONDS);
341341
}
342342
if (queueConsumerThread == null || !queueConsumerThread.isAlive()) {
343-
queueConsumerThread = new Thread(new QueueConsumer(commandQueue), "max-queue-consumer");
343+
queueConsumerThread = new Thread(new QueueConsumer(commandQueue),
344+
"OH-binding-" + getThing().getUID() + "-max-queue-consumer");
344345
queueConsumerThread.setDaemon(true);
345346
queueConsumerThread.start();
346347
}

‎bundles/org.openhab.binding.mihome/src/main/java/org/openhab/binding/mihome/internal/socket/XiaomiSocket.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313
package org.openhab.binding.mihome.internal.socket;
1414

15+
import static org.openhab.binding.mihome.internal.XiaomiGatewayBindingConstants.BINDING_ID;
16+
1517
import java.io.IOException;
1618
import java.net.DatagramPacket;
1719
import java.net.DatagramSocket;
@@ -71,7 +73,7 @@ public XiaomiSocket(String owner) {
7173
*/
7274
public XiaomiSocket(int port, String owner) {
7375
this.port = port;
74-
socketReceiveThread.setName("XiaomiSocketReceiveThread(" + port + ", " + owner + ")");
76+
socketReceiveThread.setName("OH-binding-" + BINDING_ID + "-XiaomiSocket(" + port + ", " + owner + ")");
7577
}
7678

7779
public void initialize() {

‎bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/MilightV6SessionManager.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
import org.eclipse.jdt.annotation.NonNullByDefault;
3434
import org.eclipse.jdt.annotation.Nullable;
35+
import org.openhab.binding.milight.internal.MilightBindingConstants;
3536
import org.slf4j.Logger;
3637
import org.slf4j.LoggerFactory;
3738

@@ -185,7 +186,7 @@ public MilightV6SessionManager(String bridgeId, ISessionState observer, @Nullabl
185186
throw new IllegalArgumentException("keepAliveInterval not within given limits!");
186187
}
187188

188-
sessionThread = new Thread(this, "SessionThread");
189+
sessionThread = new Thread(this, "OH-binding-" + MilightBindingConstants.BINDING_ID + "-SessionThread");
189190
}
190191

191192
/**

‎bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/QueuedSend.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.eclipse.jdt.annotation.NonNullByDefault;
2323
import org.eclipse.jdt.annotation.Nullable;
24+
import org.openhab.binding.milight.internal.MilightBindingConstants;
2425
import org.slf4j.Logger;
2526
import org.slf4j.LoggerFactory;
2627

@@ -48,7 +49,7 @@ public class QueuedSend implements Runnable, Closeable {
4849
*/
4950
public void start() {
5051
willbeclosed = false;
51-
thread = new Thread(this);
52+
thread = new Thread(this, "OH-binding-" + MilightBindingConstants.BINDING_ID + "-QueuedSend");
5253
thread.start();
5354
}
5455

‎bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/test/EmulatedV6Bridge.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public class EmulatedV6Bridge {
9292
FAKE_MAC[2], FAKE_MAC[3], FAKE_MAC[4], FAKE_MAC[5], 1 };
9393

9494
EmulatedV6Bridge() {
95-
new Thread(this::runDiscovery).start();
96-
new Thread(this::runBrigde).start();
95+
new Thread(this::runDiscovery, "OH-binding-" + MilightBindingConstants.BINDING_ID + "-runDiscovery").start();
96+
new Thread(this::runBridge, "OH-binding-" + MilightBindingConstants.BINDING_ID + "-runBridge").start();
9797
}
9898

9999
private void replaceWithMac(byte[] data, int offset) {
@@ -144,7 +144,7 @@ public void runDiscovery() {
144144
}
145145
}
146146

147-
public void runBrigde() {
147+
public void runBridge() {
148148
try {
149149
byte[] a = new byte[0];
150150
DatagramPacket sPacket = new DatagramPacket(a, a.length);

‎bundles/org.openhab.binding.pentair/src/main/java/org/openhab/binding/pentair/internal/handler/PentairBaseBridgeHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private void baseConnect() {
203203
return;
204204
}
205205

206-
Thread parserThread = new Thread(parser, "OH-pentair-" + this.getThing().getUID() + "-parser");
206+
Thread parserThread = new Thread(parser, "OH-binding-" + this.getThing().getUID() + "-parser");
207207
this.parserThread = parserThread;
208208

209209
parserThread.setDaemon(true);

‎bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/net/SocketChannelSession.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.concurrent.TimeUnit;
2525
import java.util.concurrent.atomic.AtomicReference;
2626

27+
import org.openhab.binding.russound.internal.RussoundBindingConstants;
2728
import org.slf4j.Logger;
2829
import org.slf4j.LoggerFactory;
2930

@@ -127,8 +128,10 @@ public void connect(int timeout) throws IOException {
127128

128129
responses.clear();
129130

130-
dispatchingThread = new Thread(new Dispatcher());
131-
responseThread = new Thread(new ResponseReader());
131+
dispatchingThread = new Thread(new Dispatcher(),
132+
"OH-binding-" + RussoundBindingConstants.BINDING_ID + "-dispatcher");
133+
responseThread = new Thread(new ResponseReader(),
134+
"OH-binding-" + RussoundBindingConstants.BINDING_ID + "-responseReader");
132135

133136
dispatchingThread.start();
134137
responseThread.start();

‎bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/protocol/SatelModule.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.eclipse.jdt.annotation.NonNullByDefault;
2525
import org.eclipse.jdt.annotation.Nullable;
26+
import org.openhab.binding.satel.internal.SatelBindingConstants;
2627
import org.openhab.binding.satel.internal.command.IntegraVersionCommand;
2728
import org.openhab.binding.satel.internal.command.SatelCommand;
2829
import org.openhab.binding.satel.internal.command.SatelCommand.State;
@@ -520,7 +521,7 @@ public void run() {
520521
SatelModule.this.communicationLoop(CommunicationWatchdog.this);
521522
logger.debug("Communication thread stopped");
522523
}
523-
});
524+
}, "OH-binding-" + SatelBindingConstants.BINDING_ID + "-dispatcher");
524525
thread.start();
525526
this.thread = thread;
526527
// if module is not initialized yet, send version command

0 commit comments

Comments
 (0)