Merge "FAB-2787 NodeSDK - add min ping interval"

hyperledger · Feb 22, 2018 · b7418f8 · b7418f8
2 parents 49404be + bd62382
commit b7418f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/fabric-client/lib/ChannelEventHub.js b/fabric-client/lib/ChannelEventHub.js
@@ -64,6 +64,9 @@ const START_ONLY    = 1;
 const END_ONLY      = 2;
 const START_AND_END = 3;
 
+const five_minutes_ms = 5*60*1000;
+
+
 /**
  * Transaction processing in fabric v1.1 is a long operation spanning multiple
  * components (application, endorsing peer, orderer, committing peer) and takes
@@ -314,6 +317,7 @@ var ChannelEventHub = class {
 		let request_timeout_ms = utils.getConfigSetting('request-timeout', 3000);
 		let request_timeout = request_timeout_ms / 1000;
 		options = utils.checkAndAddConfigSetting('grpc.keepalive_timeout_ms', request_timeout_ms, options);
+		options = utils.checkAndAddConfigSetting('grpc.http2.min_time_between_pings_ms', five_minutes_ms, options);
 
 		logger.info('_connect - options %j',this._peer._options);
 		this._event_client = new _eventsProto.Deliver(this._peer._endpoint.addr, this._peer._endpoint.creds, this._peer._options);

diff --git a/fabric-client/lib/EventHub.js b/fabric-client/lib/EventHub.js
@@ -30,6 +30,7 @@ var _transProto = grpc.load(__dirname + '/protos/peer/transaction.proto').protos
 var _responseProto = grpc.load(__dirname + '/protos/peer/proposal_response.proto').protos;
 var _ccProposalProto = grpc.load(__dirname + '/protos/peer/proposal.proto').protos;
 var _ccEventProto = grpc.load(__dirname + '/protos/peer/chaincode_event.proto').protos;
+const five_minutes_ms = 5*60*1000;
 
 var _validation_codes = {};
 var keys = Object.keys(_transProto.TxValidationCode);
@@ -288,6 +289,7 @@ var EventHub = class {
 		let request_timeout = request_timeout_ms / 1000;
 		options = utils.checkAndAddConfigSetting('grpc.http2.keepalive_timeout', request_timeout, options); //grpc 1.2.4
 		options = utils.checkAndAddConfigSetting('grpc.keepalive_timeout_ms', request_timeout_ms, options); //grpc 1.3.7
+		options = utils.checkAndAddConfigSetting('grpc.http2.min_time_between_pings_ms', five_minutes_ms, options); //default 5
 
 		logger.info('_connect - options %j',this._ep._options);
 		this._event_client = new _events.Events(this._ep._endpoint.addr, this._ep._endpoint.creds, this._ep._options);