0005006: Push, pull, extract thread name has wrong queue

JumpMind · May 27, 2021 · cfa7daf · cfa7daf
1 parent d87f547
commit cfa7daf
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java
@@ -533,6 +533,11 @@ public void run() {
                         boolean failed = false;
                         try {
                             MDC.put("engineName", parameterService.getEngineName());
+                            String name = parameterService.getEngineName().toLowerCase() + "-" + nodeCommunication.getCommunicationType().name().toLowerCase() + 
+                                    "-" + nodeCommunication.getQueue().toLowerCase();
+                            Thread thread = Thread.currentThread();
+                            thread.setName(thread.getName().replaceFirst(".*(-\\d+)", name + "$1"));
+
                             executor.execute(nodeCommunication, status);
                             failed = status.failed();
                         } catch (Throwable ex) {
@@ -551,7 +556,6 @@ public void run() {
                 } else {
                     ThreadPoolExecutor service = getExecutor(nodeCommunication.getCommunicationType(), 
                             nodeCommunication.getQueue());
-                    ((ChannelThreadFactory) service.getThreadFactory()).setChannelThread(nodeCommunication.getQueue());
                     service.execute(r);
                 }
             }
@@ -666,24 +670,14 @@ static class ChannelThreadFactory implements ThreadFactory {
         private final AtomicInteger threadNumber = new AtomicInteger(1);
         private String engineName;
         private String communicationType;
-        private String channelThread;
 
         public ChannelThreadFactory(String engineName, String communicationType) {
             this.engineName = engineName;
             this.communicationType = communicationType;
         }
 
-        String getChannelThread() {
-            return channelThread != null ? this.channelThread : "default";
-        }
-
-        void setChannelThread(String channelThread) {
-            this.channelThread = channelThread;
-        }
-
         public String getThreadPrefix() {
-            return new StringBuffer(engineName.toLowerCase()).append("-").append(communicationType.toLowerCase()).append("-")
-                    .append(getChannelThread()).append("-").toString();
+            return new StringBuffer(engineName.toLowerCase()).append("-").append(communicationType.toLowerCase()).append("-default-").toString();
         }
 
         public Thread newThread(Runnable r) {