Merge pull request #139 from reportportal/develop

Release
reportportal · Dec 14, 2020 · fc69a2f · fc69a2f
2 parents aff4ad9 + 6d8f45a
commit fc69a2f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+- All client threads now marked as daemon to not prevent JVM shutting down
 
 ## [5.0.16]
 ### Added

diff --git a/src/main/java/com/epam/reportportal/service/ReportPortal.java b/src/main/java/com/epam/reportportal/service/ReportPortal.java
@@ -573,6 +573,7 @@ protected ExecutorService buildExecutorService(ListenerParameters params) {
 	}
 
 	private static ExecutorService buildExecutorService(ListenerParameters params) {
-		return Executors.newFixedThreadPool(params.getIoPoolSize(), new ThreadFactoryBuilder().setNameFormat("rp-io-%s").build());
+		return Executors.newFixedThreadPool(params.getIoPoolSize(), new ThreadFactoryBuilder().setNameFormat("rp-io-%s").setDaemon(true)
+				.build());
 	}
 }
diff --git a/src/main/java/com/epam/reportportal/service/analytics/AnalyticsService.java b/src/main/java/com/epam/reportportal/service/analytics/AnalyticsService.java
@@ -23,6 +23,7 @@
 import com.epam.reportportal.utils.properties.SystemAttributesExtractor;
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.reactivex.Completable;
 import io.reactivex.Maybe;
 import io.reactivex.Scheduler;
@@ -47,7 +48,8 @@ public class AnalyticsService implements Closeable {
 	private static final String CLIENT_VALUE_FORMAT = "Client name \"%s\", version \"%s\"";
 	private static final String AGENT_VALUE_FORMAT = "Agent name \"%s\", version \"%s\"";
 
-	private final ExecutorService googleAnalyticsExecutor = Executors.newSingleThreadExecutor();
+	private final ExecutorService googleAnalyticsExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat(
+			"rp-stat-%s").setDaemon(true).build());
 	private final Scheduler scheduler = Schedulers.from(googleAnalyticsExecutor);
 	private final Analytics analytics;
 	private final List<Completable> dependencies = new CopyOnWriteArrayList<>();