undo executorservice close

onthegomap · Oct 27, 2023 · 7487205 · 7487205
1 parent dccbf78
commit 7487205
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stats/PrometheusStats.java
@@ -213,7 +213,7 @@ public Map<String, Long> dataErrors() {
 
   @Override
   public void close() {
-    executor.close();
+    executor.shutdown();
     push();
   }
 

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/worker/Worker.java
@@ -54,33 +54,33 @@ public Worker(String prefix, Stats stats, int threads, RunnableThatThrows task)
   public Worker(String prefix, Stats stats, int threads, IntConsumerThatThrows task) {
     this.prefix = prefix;
     stats.gauge(prefix + "_threads", threads);
-    try (var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix))) {
-      String parentStage = LogUtil.getStage();
-      List<CompletableFuture<?>> results = new ArrayList<>();
-      for (int i = 0; i < threads; i++) {
-        final int threadId = i;
-        results.add(CompletableFuture.runAsync(() -> {
-          LogUtil.setStage(parentStage, prefix);
-          String id = Thread.currentThread().getName();
-          LOGGER.trace("Starting worker");
-          try {
-            long start = System.nanoTime();
-            task.accept(threadId);
-            stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
-          } catch (Throwable e) {
-            System.err.println("Worker " + id + " died");
-            // when one worker dies it may close resources causing others to die as well, so only log the first
-            if (firstWorkerDied.compareAndSet(false, true)) {
-              e.printStackTrace(); // NOSONAR
-            }
-            throwFatalException(e);
-          } finally {
-            LOGGER.trace("Finished worker");
+    var es = Executors.newFixedThreadPool(threads, new NamedThreadFactory(prefix));
+    String parentStage = LogUtil.getStage();
+    List<CompletableFuture<?>> results = new ArrayList<>();
+    for (int i = 0; i < threads; i++) {
+      final int threadId = i;
+      results.add(CompletableFuture.runAsync(() -> {
+        LogUtil.setStage(parentStage, prefix);
+        String id = Thread.currentThread().getName();
+        LOGGER.trace("Starting worker");
+        try {
+          long start = System.nanoTime();
+          task.accept(threadId);
+          stats.timers().finishedWorker(prefix, Duration.ofNanos(System.nanoTime() - start));
+        } catch (Throwable e) {
+          System.err.println("Worker " + id + " died");
+          // when one worker dies it may close resources causing others to die as well, so only log the first
+          if (firstWorkerDied.compareAndSet(false, true)) {
+            e.printStackTrace(); // NOSONAR
           }
-        }, es));
-      }
-      done = joinFutures(results);
+          throwFatalException(e);
+        } finally {
+          LOGGER.trace("Finished worker");
+        }
+      }, es));
     }
+    es.shutdown();
+    done = joinFutures(results);
   }
 
   /**