From f5acc5d1e99d417115f73b4604e4210bb6fc53ca Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sun, 6 Sep 2020 09:53:20 -0400 Subject: [PATCH] set thread names in pools --- .../org/cobbzilla/wizard/model/entityconfig/ModelSetup.java | 2 +- .../org/cobbzilla/wizard/analytics/AnalyticsQueueService.java | 4 ++-- .../java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java index 0f2712a..0493430 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java @@ -392,7 +392,7 @@ public class ModelSetup { if (childClassName == null) childClassName = entity.getClass().getPackage().getName() + "." + childEntityType; final Class childClass = forName(childClassName); - @Cleanup("shutdownNow") final ExecutorService exec = fixedPool(Math.min(children.length, maxConcurrency)); + @Cleanup("shutdownNow") final ExecutorService exec = fixedPool(Math.min(children.length, maxConcurrency), "ModelSetup.exec"); final Set> futures = new HashSet<>(); for (final JsonNode child : children) { if (!(child instanceof ObjectNode)) { diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/analytics/AnalyticsQueueService.java b/wizard-server/src/main/java/org/cobbzilla/wizard/analytics/AnalyticsQueueService.java index 13eb7c9..880a50a 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/analytics/AnalyticsQueueService.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/analytics/AnalyticsQueueService.java @@ -23,7 +23,7 @@ public class AnalyticsQueueService { @Autowired private RestServerConfiguration configuration; private final Map analyticsData = new HashMap<>(); - private final ExecutorService executorService = fixedPool(10); + private final ExecutorService exec = fixedPool(10, "AnalyticsQueueService.exec"); public void report(String uuid, AnalyticsData data) { synchronized (analyticsData) { analyticsData.put(uuid, data); } @@ -60,7 +60,7 @@ public class AnalyticsQueueService { analyticsData.clear(); } - copy.forEach((key, value) -> executorService.submit(() -> { + copy.forEach((key, value) -> exec.submit(() -> { final HttpRequestBean request = new HttpRequestBean(POST, writeUrl, value.buildMessage()); try { final HttpResponseBean response = HttpUtil.getResponse(request); diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java index 2047df6..f9430d6 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchHelper.java @@ -104,7 +104,7 @@ public class SqlViewSearchHelper { } final ResultSetBean rs = configuration.execSql(query, args); final List> results = new ArrayList<>(rs.rowCount()); - final ExecutorService exec = searchByEncryptedField ? fixedPool(Math.min(16, rs.rowCount())) : null; + final ExecutorService exec = searchByEncryptedField ? fixedPool(Math.min(16, rs.rowCount()), "SqlViewSearchHelper.exec") : null; for (Map row : rs.getRows()) { if (searchByEncryptedField) {