@hyperledger/caliper-core - npm Package Compare versions

Comparing version 0.4.0-unstable-20200610103838 to 0.4.0-unstable-20200616101811

lib/common/config/Config.js

@@ -135,6 +135,6 @@ /*
             Discovery: 'caliper-fabric-gateway-discovery',
+            Enabled: 'caliper-fabric-gateway-enabled',
             EventStrategy: 'caliper-fabric-gateway-eventstrategy',
-            GatewayLocalHost: 'caliper-fabric-gateway-gatewaylocalhost',
+            LocalHost: 'caliper-fabric-gateway-localhost',
             QueryStrategy: 'caliper-fabric-gateway-querystrategy',
-            UseGateway: 'caliper-fabric-gateway-usegateway',
         }
@@ -141,0 +141,0 @@ }

lib/common/messaging/mqtt-master.js

@@ -118,2 +118,3 @@ /*
     async dispose() {
+        Logger.info('Disconnecting from MQTT service');
         const messengerDisconnectedPromise = new Promise((resolve, reject) => {
@@ -126,3 +127,4 @@ this.messengerDisconnectedPromise = {
 
-        this.mqttClient.end(false, undefined, () => {
+        this.mqttClient.end(false, {}, () => {
+            Logger.info('MQTT connection closed');
             this.messengerDisconnectedPromise.resolve();
@@ -129,0 +131,0 @@ });

lib/common/messaging/mqtt-worker.js

@@ -127,2 +127,3 @@ /*
     async dispose() {
+        Logger.info('Disconnecting from MQTT service');
         const messengerDisconnectedPromise = new Promise((resolve, reject) => {
@@ -135,3 +136,4 @@ this.messengerDisconnectedPromise = {
 
-        this.mqttClient.end(true, undefined, () => {
+        this.mqttClient.end(false, {}, () => {
+            Logger.info('MQTT connection closed');
             this.messengerDisconnectedPromise.resolve();
@@ -138,0 +140,0 @@ });

lib/common/prometheus/prometheus-push-client.js

@@ -102,3 +102,3 @@ /*
         // Convert body to binary, the newline is important
-        body = new Buffer(body + '\n', 'binary');
+        body = Buffer.from(body + '\n', 'binary');
 
@@ -105,0 +105,0 @@ // Assign request options

lib/master/orchestrators/monitor-orchestrator.js

@@ -128,2 +128,3 @@ /*
     async stopAllMonitors() {
+        logger.info('Stopping all monitors');
         if(this.started === true) {
@@ -130,0 +131,0 @@

lib/master/orchestrators/worker-orchestrator.js

@@ -59,3 +59,3 @@ /*
         this.workers = {};
-        this.workerObjects = [];
+        this.workerObjects = [];        // used in the process communications
         this.updates = {id:0, data:[]}; // contains txUpdated messages
@@ -490,12 +490,13 @@ this.results = [];              // cumulative results
     /**
-     * Stop all test workers (child processes)
+     * Stop all test workers and disconnect from messenger
      */
     async stop() {
+        logger.info('Sending exit message to connected workers');
         this.messenger.send(['all'], TYPES.EXIT, {});
-        await this.messenger.dispose();
 
-        for (let workerObject of this.workerObjects) {
-            workerObject.kill();
-        }
+        // Internally spawned workers are killed within the messenger handling of 'exit', but clean the array of processes here
         this.workerObjects = [];
+
+        // dispose of master messenger
+        await this.messenger.dispose();
     }
@@ -543,9 +544,9 @@
         // Spawn the worker. The index is assigned upon connection
-        let cliPath = process.argv[1];
-        let workerCommands = ['launch', 'worker'];
-        let remainingArgs = process.argv.slice(4);
+        const cliPath = process.argv[1];
+        const workerCommands = ['launch', 'worker'];
+        const remainingArgs = process.argv.slice(4);
 
-        let nodeArgs = workerCommands.concat(remainingArgs);
+        const nodeArgs = workerCommands.concat(remainingArgs);
 
-        let worker = childProcess.fork(cliPath, nodeArgs, {
+        const worker = childProcess.fork(cliPath, nodeArgs, {
             env: process.env,
@@ -552,0 +553,0 @@ cwd: process.cwd()

lib/master/report/report-builder.js

@@ -19,3 +19,3 @@ /*
 const Utils = require('../../common/utils/caliper-utils');
-const Logger = Utils.getLogger('caliper-flow');
+const Logger = Utils.getLogger('report-builder');
 const fs = require('fs');
@@ -22,0 +22,0 @@ const Mustache = require('mustache');

lib/worker/client/caliper-local-client.js

@@ -24,3 +24,4 @@ /*
 
-const Logger = CaliperUtils.getLogger('caliper-local-client.js');
+const Logger = CaliperUtils.getLogger('caliper-local-client');
+
 /**
@@ -27,0 +28,0 @@ * Class for Client Interaction

lib/worker/client/message-handler.js

@@ -33,2 +33,3 @@ /*
     constructor(handlers, messenger) {
+
         if (!handlers.init) {
@@ -240,3 +241,3 @@ let msg = 'Handler for "init" is not specified';
                 await context.messenger.dispose();
-                logger.info(`Handled "exit" message for worker ${context.workerId}`);
+                logger.info(`Handled "exit" message for worker ${context.workerId}, exiting process`);
                 process.exit(0);
@@ -243,0 +244,0 @@ break;

package.json

 {
     "name": "@hyperledger/caliper-core",
     "description": "Core Hyperledger Caliper module, used for running performance benchmarks that interact with blockchain technologies",
-    "version": "0.4.0-unstable-20200610103838",
+    "version": "0.4.0-unstable-20200616101811",
     "repository": {
@@ -6,0 +6,0 @@ "type": "git",

No alert changes

Improved metrics

Total package byte prevSize

381125

increased by0.13%

Lines of code

8559

increased by0.06%

No dependency changes