X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=6e234e2ea3dab6f045bfbfca84f7556afbff9f3c;hb=192566ec60b064afa6f1377fbf667152d93d5fe6;hp=32107e48635314e25269cc37e2c0ad7fdd3fcd75;hpb=1416660efeb6aabf366295ebc79067ccc4df9897;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 32107e48..6e234e2e 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -62,12 +62,15 @@ export class FixedThreadPool<
     // FIXME: wait for tasks to be finished
     const workerNode = this.workerNodes[workerNodeKey]
     const worker = workerNode.worker
-    const waitWorkerExit = new Promise<void>((resolve) => {
+    const waitWorkerExit = new Promise<void>(resolve => {
       worker.on('exit', () => {
         resolve()
       })
     })
-    await this.sendKillMessageToWorker(workerNodeKey, worker.threadId)
+    await this.sendKillMessageToWorker(
+      workerNodeKey,
+      workerNode.info.id as number
+    )
     workerNode.closeChannel()
     await worker.terminate()
     await waitWorkerExit
@@ -86,14 +89,14 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected sendStartupMessageToWorker (workerNodeKey: number): void {
-    const worker = this.workerNodes[workerNodeKey].worker
-    const port2: MessagePort = (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
-    ).port2
+    const workerNode = this.workerNodes[workerNodeKey]
+    const worker = workerNode.worker
+    const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+      .port2
     worker.postMessage(
       {
         ready: false,
-        workerId: worker.threadId,
+        workerId: workerNode.info.id,
         port: port2
       },
       [port2]