summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/taskmanager/tasks/PortScan.java
diff options
context:
space:
mode:
authorSimon Rettberg2023-02-15 15:01:53 +0100
committerSimon Rettberg2023-02-15 15:01:53 +0100
commit96f761912019bcf6b52e8b2e2f4cf4a7ffe5ab17 (patch)
treeface49df473d58b2c761535d6ac055ce03372ec6 /src/main/java/org/openslx/taskmanager/tasks/PortScan.java
parent[WakeOnLan] Fix thread leak from ThreadPool (diff)
downloadtmlite-bwlp-96f761912019bcf6b52e8b2e2f4cf4a7ffe5ab17.tar.gz
tmlite-bwlp-96f761912019bcf6b52e8b2e2f4cf4a7ffe5ab17.tar.xz
tmlite-bwlp-96f761912019bcf6b52e8b2e2f4cf4a7ffe5ab17.zip
Add names to all ThreadPool threads
Diffstat (limited to 'src/main/java/org/openslx/taskmanager/tasks/PortScan.java')
-rw-r--r--src/main/java/org/openslx/taskmanager/tasks/PortScan.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/PortScan.java b/src/main/java/org/openslx/taskmanager/tasks/PortScan.java
index 3471897..dab97f8 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/PortScan.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/PortScan.java
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.openslx.satserver.util.Exec;
import org.openslx.taskmanager.api.AbstractTask;
+import org.openslx.util.PrioThreadFactory;
import com.google.gson.annotations.Expose;
@@ -72,7 +73,8 @@ public class PortScan extends AbstractTask
certFile = tmpFile.getAbsolutePath();
}
// Execute scan in parallel (4 tasks) to speed things up
- ExecutorService tp = Executors.newFixedThreadPool( ports.length > 4 ? 4 : ports.length );
+ ExecutorService tp = Executors.newFixedThreadPool( ports.length > 4 ? 4 : ports.length,
+ new PrioThreadFactory( "PortScan" ) );
final List<Result> results = new ArrayList<>();
for ( final int port : ports ) {
tp.submit( new Callable<Object>() {
@@ -90,7 +92,7 @@ public class PortScan extends AbstractTask
}
tp.shutdown();
try {
- tp.awaitTermination( ports.length * 2, TimeUnit.SECONDS );
+ tp.awaitTermination( ports.length * 2 + 10, TimeUnit.SECONDS );
} catch ( InterruptedException e ) {
// ...
}