[Master] New event handler for hlfv1 connector (#4477)

contributes to #4461

Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>

Author: davek-at-ibm

packages/composer-common/lib/log/logger.js

@@ -70,7 +70,9 @@ const _logLevelAsString = {
 
 // If  composer[debug]:acls is provided, the debug level of trace will be used for specified string.
 const PROFILES = {
-    'acls' : ['composer[#]:AccessController']
+    'acls' : ['composer[#]:AccessController'],
+    'hlfv1': ['composer[#]:HLFConnectionManager','composer[#]:HLFConnection',
+        'composer[#]:HLFQueryHandler', 'composer[#]:HLFTxEventHandler']
 };
 
 /**
@@ -304,7 +306,7 @@ class Logger {
      *
      * @param {String} method calling method
      * @param {String} msg Text Message
-     * @param {TransactionID} txId The node-sdk transaction id
+     * @param {TransactionID} txId The node-sdk transaction id or null if no txid
      * @param {Date} startTime Date object representing the start of the timed block
      *
      * @private
@@ -314,7 +316,11 @@ class Logger {
             return;
         }
         const timeTaken = (Date.now() - startTime).toFixed(2);
-        this.intlog('verbose', method, `[${txId.getTransactionID().substring(0, 8)}] ${msg} ${timeTaken}ms`);
+        if (txId && txId.getTransactionID) {
+            this.intlog('verbose', method, `[${txId.getTransactionID().substring(0, 8)}] ${msg} ${timeTaken}ms`);
+        } else {
+            this.intlog('verbose', method, `[NO TXID ] ${msg} ${timeTaken}ms`);
+        }
     }
 
     /**

packages/composer-common/lib/log/winstonInjector.js

@@ -62,6 +62,8 @@ exports.getLogger = function (config){
         colorize: true,
         label: PRODUCT_LABEL,
         silent: (consoleLevel===null),
+        timestamp: timestampFn,
+        formatter: formatterFn,
         level: consoleLevel
     };
 

packages/composer-common/test/log/logger.js

@@ -288,6 +288,12 @@ describe('Logger', () => {
             sinon.assert.calledWith(logger.intlog, 'verbose', 'Method', sinon.match.string);
         });
 
+        it('perf method should call verbose level and work without a txid, no args', () => {
+            logger.perf('Method', 'Perf message', null, new Date());
+            sinon.assert.calledOnce(logger.intlog);
+            sinon.assert.calledWith(logger.intlog, 'verbose', 'Method', sinon.match.string);
+        });
+
         it('error method should call error level, no args', () => {
             logger.error('Method', 'Message', 'Data');
             sinon.assert.calledOnce(logger.intlog);