Add more informative thread names

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 7c8cff5d6297d11f185cd3e3283fdc8d9446f948..fd536d107349ab911ffb7db76496f4019e5f671e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -81,6 +81,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

+import java.util.concurrent.atomic.AtomicInteger;

 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;


@@ -749,6 +750,8 @@ public class ManagerImpl implements Manager {
         }
     }
 
         }
     }
 

+    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+

     private void startReceiveThreadIfRequired() {
         if (receiveThread != null) {
             return;
     private void startReceiveThreadIfRequired() {
         if (receiveThread != null) {
             return;


@@ -784,6 +787,7 @@ public class ManagerImpl implements Manager {
                 }
             }
         });
                 }
             }
         });

+        receiveThread.setName("receive-" + threadNumber.getAndIncrement());

 
         receiveThread.start();
     }
 
         receiveThread.start();
     }

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 795919f6e7168ebc85f97123cd2ba5607edad559..98f4ac6918067cfcaae15eb4c3696639804d9d8b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -62,6 +62,7 @@ public class MessageSendLogStore implements AutoCloseable {
                 logger.debug("Stopping msl cleanup thread");
             }
         });
                 logger.debug("Stopping msl cleanup thread");
             }
         });

+        cleanupThread.setName("msl-cleanup");

         cleanupThread.setDaemon(true);
         cleanupThread.start();
     }
         cleanupThread.setDaemon(true);
         cleanupThread.start();
     }

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 020c91c1cd9d29d391a979f5def9bd288fbac9cd..34a80226cbbf7508d2740458a47ddb177529a0b1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -36,6 +36,7 @@ import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;

+import java.util.concurrent.atomic.AtomicInteger;

 import java.util.function.Consumer;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 import java.util.function.Consumer;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {


@@ -234,8 +235,10 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         });
     }
 
         });
     }
 

+    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+

     private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
     private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {

-        new Thread(() -> {
+        final var thread = new Thread(() -> {

             while (true) {
                 final SocketChannel channel;
                 final String clientString;
             while (true) {
                 final SocketChannel channel;
                 final String clientString;


@@ -250,16 +253,20 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                     break;
                 }
                     }
                     break;
                 }

-                new Thread(() -> {
+                final var connectionThread = new Thread(() -> {

                     try (final var c = channel) {
                         socketHandler.accept(c);
                         logger.info("Connection closed: " + clientString);
                     } catch (IOException e) {
                         logger.warn("Failed to close channel", e);
                     }
                     try (final var c = channel) {
                         socketHandler.accept(c);
                         logger.info("Connection closed: " + clientString);
                     } catch (IOException e) {
                         logger.warn("Failed to close channel", e);
                     }

-                }).start();
+                });
+                connectionThread.setName("daemon-connection-" + threadNumber.getAndIncrement());
+                connectionThread.start();

             }
             }

-        }).start();
+        });
+        thread.setName("daemon-listener");
+        thread.start();

     }
 
     private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
     }
 
     private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(


@@ -367,6 +374,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
         conn.exportObject(signal);
         final var initThread = new Thread(signal::initObjects);
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
         conn.exportObject(signal);
         final var initThread = new Thread(signal::initObjects);

+        initThread.setName("dbus-init");

         initThread.start();
 
         logger.debug("Exported dbus object: " + objectPath);
         initThread.start();
 
         logger.debug("Exported dbus object: " + objectPath);

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index a11d8fa06c11915b4305b705e892d424bf1e11ba..2d2114447ac538e751c8a16a94f730cc8ef5486b 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -96,14 +96,16 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public String link(final String newDeviceName) throws Error.Failure {
         try {
             final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
     public String link(final String newDeviceName) throws Error.Failure {
         try {
             final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();

-            new Thread(() -> {
+            final var thread = new Thread(() -> {

                 final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {
                     e.printStackTrace();
                 }
                 final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
                 } catch (IOException | TimeoutException | UserAlreadyExists e) {
                     e.printStackTrace();
                 }

-            }).start();
+            });
+            thread.setName("dbus-link");
+            thread.start();

             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());