X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fworkers.js;h=ee03778d47d603711ee16e6b994e5955a49855d7;hb=b755d5beab080feedc652bac13e376b902321040;hp=8641ed9e871deafce80c0adafd5b9531443ec209;hpb=50811da2e375e78179b56fe78fd7674ad2f360fd;p=poolifier.git

diff --git a/lib/workers.js b/lib/workers.js
index 8641ed9e..ee03778d 100644
--- a/lib/workers.js
+++ b/lib/workers.js
@@ -3,7 +3,6 @@ const {
   isMainThread, parentPort
 } = require('worker_threads')
 const { AsyncResource } = require('async_hooks')
-const maxInactiveTime = 1000 * 60
 
 /**
  * An example worker that will be always alive, you just need to extend this class if you want a static pool.<br>
@@ -13,20 +12,22 @@ const maxInactiveTime = 1000 * 60
  * @since 0.0.1
  */
 class ThreadWorker extends AsyncResource {
-  constructor (fn) {
+  constructor (fn, opts) {
     super('worker-thread-pool:pioardi')
+    this.opts = opts || {}
+    this.maxInactiveTime = this.opts.maxInactiveTime || (1000 * 60)
     this.lastTask = Date.now()
     if (!fn) throw new Error('Fn parameter is mandatory')
     // keep the worker active
     if (!isMainThread) {
-      this.interval = setInterval(this._checkAlive.bind(this), maxInactiveTime)
+      this.interval = setInterval(this._checkAlive.bind(this), this.maxInactiveTime / 2)
       this._checkAlive.bind(this)()
     }
     parentPort.on('message', (value) => {
-      if (value && value._id) {
+      if (value && value.data && value._id) {
         // here you will receive messages
         // console.log('This is the main thread ' + isMainThread)
-        const res = this.runInAsyncScope(fn, null, value)
+        const res = this.runInAsyncScope(fn, null, value.data)
         this.parent.postMessage({ data: res, _id: value._id })
         this.lastTask = Date.now()
       } else if (value.parent) {
@@ -41,7 +42,7 @@ class ThreadWorker extends AsyncResource {
   }
 
   _checkAlive () {
-    if ((Date.now() - this.lastTask) > maxInactiveTime) {
+    if ((Date.now() - this.lastTask) > this.maxInactiveTime) {
       this.parent.postMessage({ kill: 1 })
     }
   }