Better pool shutdown

amphp · Dec 27, 2023 · 48653bc · 48653bc
1 parent 470293d
commit 48653bc
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Worker/ContextWorkerPool.php b/src/Worker/ContextWorkerPool.php
@@ -164,15 +164,12 @@ public function shutdown(): void
  );
  }
 
- $workers = $this->workers;
- ($this->exitStatus = async(static function () use ($workers): void {
- foreach ($workers as $worker) {
- \assert($worker instanceof Worker);
- if ($worker->isRunning()) {
- $worker->shutdown();
- }
- }
- }))->await();
+ $futures = \array_map(
+ static fn (Worker $worker) => async($worker->shutdown(...)),
+ \iterator_to_array($this->workers),
+ );
+
+ ($this->exitStatus = async(Future\awaitAll(...), $futures)->map(static fn () => null))->await();
  }
 
  /**