X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=f291c52428fee35bd384a845945d64de8ee539e3;hb=985d0e7986b2cad23bb08ae0561b2a6ff9afdf9e;hp=242c46982236357626ae50fae5f3a33d7c3f04eb;hpb=f59e102739e13698f278f1d9d58ab26ed8150442;p=poolifier.git

diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index 242c4698..f291c524 100644
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -37,7 +37,7 @@ export abstract class AbstractWorker<
   Response = unknown
 > extends AsyncResource {
   /**
-   * Worker Id.
+   * Worker id.
    */
   protected abstract id: number
   /**
@@ -206,10 +206,10 @@ export abstract class AbstractWorker<
    * Handles an error and convert it to a string so it can be sent back to the main worker.
    *
    * @param e - The error raised by the worker.
-   * @returns Message of the error.
+   * @returns The error message.
    */
   protected handleError (e: Error | string): string {
-    return e as string
+    return e instanceof Error ? e.message : e
   }
 
   /**
@@ -233,13 +233,13 @@ export abstract class AbstractWorker<
         id: message.id
       })
     } catch (e) {
-      const err = this.handleError(e as Error)
+      const errorMessage = this.handleError(e as Error | string)
       this.sendToMainWorker({
         taskError: {
-          message: err,
+          workerId: this.id,
+          message: errorMessage,
           data: message.data
         },
-        workerId: this.id,
         id: message.id
       })
     } finally {
@@ -270,13 +270,13 @@ export abstract class AbstractWorker<
         return null
       })
       .catch(e => {
-        const err = this.handleError(e as Error)
+        const errorMessage = this.handleError(e as Error | string)
         this.sendToMainWorker({
           taskError: {
-            message: err,
+            workerId: this.id,
+            message: errorMessage,
             data: message.data
           },
-          workerId: this.id,
           id: message.id
         })
       })