xcraft-core-utils 4.3.6 → 4.3.9

package/.zou-flow

@@ -0,0 +1,3 @@
+[update-version]
+	freezed = true
+	package-json = package.json

package/lib/job-queue.js

@@ -32,14 +32,18 @@ class JobQueue {
     this.waitDelay = options.waitDelay;
     this.channel = name.toLowerCase().replace(/\.|\[|\//g, '-');
     this.runner = watt(function* (...args) {
-      this.running++;
       this.runningSamples++;
-      yield* runner(...args);
+      try {
+        yield* runner(...args);
+      } finally {
+        this.endOfRunningSamples++;
+      }
     });
     this.parallelLimit = parallelLimit;
     this.waiting = new Map();
     this.running = 0;
     this.runningSamples = 0;
+    this.endOfRunningSamples = 0;
     this._mutex = new locks.Mutex();
     const busClient = require('xcraft-core-busclient').getGlobal();
     this.resp = busClient.newResponse('job-queue', 'token');
@@ -58,7 +62,8 @@ class JobQueue {
       current: 0,
       total: 0,
     });
-    this.runningSamples = 0;
+    this.runningSamples -= this.endOfRunningSamples;
+    this.endOfRunningSamples = 0;
   }
 
   _log() {

package/lib/runnerInstance.js

@@ -66,6 +66,7 @@ class Runner {
       }
 
       //update counters
+      jobQueue.running++;
       this.totalRunning++;
 
       //trigger job start on queue runner

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-utils",
-  "version": "4.3.6",
+  "version": "4.3.9",
   "description": "Xcraft utils",
   "main": "index.js",
   "engines": {