[FAB-6971] GRPC_SSL_CIPHER_SUITES not correctly set

FAB-5805 introduced a change in the way the SDKi loads config files and this can result in the GRPC_SSL_CIPHER_SUITES env variable not being set correctly. This is evident in the e2e fabric tests. Change-Id: Iacc340c9e9b3d5e0ae691d38d91693f910043663 Signed-off-by: Gari Singh <[email protected]>
hyperledger · Nov 12, 2017 · 1f03242 · 1f03242
1 parent 2d3f780
commit 1f03242
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fabric-client/lib/Client.js b/fabric-client/lib/Client.js
@@ -18,7 +18,6 @@
 
 var sdkUtils = require('./utils.js');
 var clientUtils = require('./client-utils.js');
-process.env.GRPC_SSL_CIPHER_SUITES = sdkUtils.getConfigSetting('grpc-ssl-cipher-suites');
 
 var api = require('./api.js');
 var BaseClient = require('./BaseClient.js');
@@ -51,6 +50,8 @@ var config = sdkUtils.getConfig();
 // setup the location of the default config shipped with code
 var default_config = path.resolve( __dirname, '../config/default.json');
 config.reorderFileStores(default_config); //make sure this default has precedences
+// set default SSL ciphers for gRPC
+process.env.GRPC_SSL_CIPHER_SUITES = sdkUtils.getConfigSetting('grpc-ssl-cipher-suites');
 
 var logger = sdkUtils.getLogger('Client.js');